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

assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits.

Browse source
This commit is contained in:
Joey Hess 2014-07-05 17:12:05 -04:00
parent 91688ae46e
commit 4a66cd3f91
4 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Annex/AutoMerge.hs
View file

@ -28,7 +28,11 @@ import qualified Data.Set as S
{- Merges from a branch into the current branch
- (which may not exist yet),
- with automatic merge conflict resolution. -}
- with automatic merge conflict resolution.
-
- Callers should use Git.Branch.changed first, to make sure that
- there are changed from the current branch to the branch being merged in.
-}
autoMergeFrom :: Git.Ref -> (Maybe Git.Ref) -> Git.Branch.CommitMode -> Annex Bool
autoMergeFrom branch currbranch commitmode = do
showOutput