diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-05 17:12:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-05 17:12:05 -0400 |
| commit | 4a66cd3f918ab11af2bb5a8e7077dd603d68cec0 (patch) | |
| tree | d01e0dc4c2e8ff1dcd4ebce58c8e6ea570a60d5f /Assistant/Threads/Merger.hs | |
| parent | 91688ae46e08ab59d5010e1f218873ba2465bc6e (diff) | |
assistant: Fix bug, introduced in last release, 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 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 8d660da069..63c9968a7d 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -79,11 +79,13 @@ onChange file mergecurrent (Just current) | equivBranches changedbranch current = do - debug - [ "merging", Git.fromRef changedbranch - , "into", Git.fromRef current - ] - void $ liftAnnex $ autoMergeFrom changedbranch (Just current) Git.Branch.AutomaticCommit + void $ liftAnnex $ autoMergeFrom changedbranch (Just current) Git.Branch.AutomaticCommit + whenM (liftAnnex $ inRepo $ Git.Branch.changed current changedbranch) $ do + debug + [ "merging", Git.fromRef changedbranch + , "into", Git.fromRef current + ] + void $ liftAnnex $ autoMergeFrom changedbranch (Just current) Git.Branch.AutomaticCommit mergecurrent _ = noop handleDesynced = case fromTaggedBranch changedbranch of |