Skip to content

Commit 29b6754

Browse files
jrngitster
authored andcommitted
am: remove rebase-apply directory before gc
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>
1 parent 689b8c2 commit 29b6754

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

git-am.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,5 @@ do
776776
go_next
777777
done
778778

779-
git gc --auto
780-
781779
rm -fr "$dotest"
780+
git gc --auto

0 commit comments

Comments
 (0)