sync, merge: Bug fix: Don't try to merge into master when in a bare repo.

1 files changed, 7 insertions, 4 deletions

diff --git a/Command/Sync.hs b/Command/Sync.hs
index a6ae610f8..551c2fa69 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -101,10 +101,13 @@ mergeLocal :: Git.Ref -> CommandStart
 mergeLocal branch = go =<< needmerge
   where
 	syncbranch = syncBranch branch
-	needmerge = do
-		unlessM (inRepo $ Git.Ref.exists syncbranch) $
-			inRepo $ updateBranch syncbranch
-		inRepo $ Git.Branch.changed branch syncbranch
+	needmerge = ifM isBareRepo
+		( return False
+		, do
+			unlessM (inRepo $ Git.Ref.exists syncbranch) $
+				inRepo $ updateBranch syncbranch
+			inRepo $ Git.Branch.changed branch syncbranch
+		)
 	go False = stop
 	go True = do
 		showStart "merge" $ Git.Ref.describe syncbranch