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

avoid double commit during transition

Browse source 
The second commit had some bad refs which resulted in the race detection
code running. But that commit was unnecessary anyway, it only was there to
merge in the other refs.
This commit is contained in:
Joey Hess 2013-09-03 16:31:32 -04:00
parent b51dffa46d
commit 4079f9cfe8
2 changed files with 26 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Forget.hs
View file

@ -45,7 +45,7 @@ perform ts True = do
recordTransitions Branch.change ts
-- get branch committed before contining with the transition
Branch.update
void $ Branch.performTransitions ts True
void $ Branch.performTransitions ts True []
next $ return True
perform _ False = do
showLongNote "To forget git-annex branch history, you must specify --force. This deletes metadata!"