Skip to content

Commit

Permalink
am: remove rebase-apply directory before gc
Browse files Browse the repository at this point in the history
When git am does an automatic gc it doesn't clean up the rebase-apply
directory until after this has finished.  This means that if the user
aborts the gc then future am or rebase operations will report that an
existing operation is in progress, which is undesirable and confusing.

Reported by Mark Brown <broonie@debian.org> through
http://bugs.debian.org/570966

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed Feb 23, 2010
1 parent 689b8c2 commit 29b6754
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -776,6 +776,5 @@ do
go_next
done

git gc --auto

rm -fr "$dotest"
git gc --auto

0 comments on commit 29b6754

Please sign in to comment.