diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-09 15:18:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-09 15:18:00 -0400 |
| commit | 06acd390fbc2340c5878cbf3831e058f71080988 (patch) | |
| tree | 968f07a1746b72df9656a4fd390d28415b502f1a /Assistant/Threads/Merger.hs | |
| parent | 7a62581096d328a0403944286125c1bab8be0edc (diff) | |
Really fix bug that caused the assistant to make many unncessary empty merge commits.
Diffstat (limited to 'Assistant/Threads/Merger.hs')
| -rw-r--r-- | Assistant/Threads/Merger.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 63c9968a7..62dab59af 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -78,8 +78,7 @@ onChange file changedbranch = fileToBranch file mergecurrent (Just current) - | equivBranches changedbranch current = do - void $ liftAnnex $ autoMergeFrom changedbranch (Just current) Git.Branch.AutomaticCommit + | equivBranches changedbranch current = whenM (liftAnnex $ inRepo $ Git.Branch.changed current changedbranch) $ do debug [ "merging", Git.fromRef changedbranch |