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 mergeLocal branch = go =<< needmerge
where where
syncbranch = syncBranch branch syncbranch = syncBranch branch
needmerge = do needmerge = ifM isBareRepo
unlessM (inRepo $ Git.Ref.exists syncbranch) $ ( return False
inRepo $ updateBranch syncbranch , do
inRepo $ Git.Branch.changed branch syncbranch unlessM (inRepo $ Git.Ref.exists syncbranch) $
inRepo $ updateBranch syncbranch
inRepo $ Git.Branch.changed branch syncbranch
)
go False = stop go False = stop
go True = do go True = do
showStart "merge" $ Git.Ref.describe syncbranch showStart "merge" $ Git.Ref.describe syncbranch

1
debian/changelog vendored
View file

@ -3,6 +3,7 @@ git-annex (4.20130816) UNRELEASED; urgency=low
* Debian: Run the builtin test suite as an autopkgtest. * Debian: Run the builtin test suite as an autopkgtest.
* Debian: Recommend ssh-askpass, which ssh will use when the assistant * Debian: Recommend ssh-askpass, which ssh will use when the assistant
is run w/o a tty. Closes: #719832 is run w/o a tty. Closes: #719832
* sync, merge: Bug fix: Don't try to merge into master when in a bare repo.
-- Joey Hess <joeyh@debian.org> Thu, 15 Aug 2013 15:47:52 +0200 -- Joey Hess <joeyh@debian.org> Thu, 15 Aug 2013 15:47:52 +0200