diff options
| -rw-r--r-- | Annex/Branch.hs | 2 | ||||
| -rw-r--r-- | Command/Unused.hs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index a62a1384c..ccc614555 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -130,6 +130,8 @@ commit message = whenM journalDirty $ lockJournal $ do -} update :: Annex () update = onceonly $ do + -- ensure branch exists + create -- check what needs updating before taking the lock dirty <- journalDirty c <- filterM (changedBranch name . snd) =<< siblingBranches diff --git a/Command/Unused.hs b/Command/Unused.hs index ccb9c48d8..7f9edfef2 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -153,7 +153,7 @@ excludeReferenced l = do where -- Skip the git-annex branches, and get all other unique refs. refs = map Git.Ref . - last . + map last . nubBy cmpheads . filter ourbranches . map words . lines . L.unpack |