summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-02-22 08:35:46 -0600
committerJunio C Hamano <gitster@pobox.com>2010-02-23 14:26:29 -0800
commit29b67543d3060a08bee601dbad91dd400e833052 (patch)
tree8aab1fda65e91e42f38da3771e4bb4a30b55a5c9 /git-am.sh
parent689b8c290db9d5880699dd3538134daffc1c55d0 (diff)
downloadgit-29b67543d3060a08bee601dbad91dd400e833052.tar.gz
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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-am.sh b/git-am.sh
index 3c08d53161..ebfbee59d3 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -776,6 +776,5 @@ do
go_next
done
-git gc --auto
-
rm -fr "$dotest"
+git gc --auto