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

ensure branch exists before trying to update it

Browse source 
The branch may not exist, if .git/annex has been copied over from another
repo (or a corrupted repo). I suppose it could also have gotten deleted
somehow. Without this, there is a confusing failure.
This commit is contained in:
Joey Hess 2011-11-16 18:56:06 -04:00
parent 6d9f525f64
commit 1ffd54ef78
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Annex/Branch.hs
View file

@ -130,6 +130,8 @@ commit message = whenM journalDirty $ lockJournal $ do
-} -}
update :: Annex () update :: Annex ()
update = onceonly $ do update = onceonly $ do
-- ensure branch exists
create
-- check what needs updating before taking the lock -- check what needs updating before taking the lock
dirty <- journalDirty dirty <- journalDirty
c <- filterM (changedBranch name . snd) =<< siblingBranches c <- filterM (changedBranch name . snd) =<< siblingBranches