mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2013-08-17 21:29:44 +02:00
parent 6b4b2a6515
commit a6a047192e
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Command/Sync.hs
View file

@ -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