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 | 5edba1bfe62ac4e77906b5b0057280d2d616c61e (patch) | |
| tree | 9fa17a7e67fa3d3159318a4a318c55938327020f /Assistant | |
| parent | dc7c9a5db72ff05d5eb835f2406f2626a33553df (diff) | |
assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits.
Diffstat (limited to 'Assistant')
| -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 8d660da06..63c9968a7 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 |