git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] am: remove rebase-apply directory before gc
       [not found] <20100222140911.30949.49607.reportbug@rakim.wolfsonmicro.main>
@ 2010-02-22 14:35 ` Jonathan Nieder
  0 siblings, 0 replies; only message in thread
From: Jonathan Nieder @ 2010-02-22 14:35 UTC (permalink / raw)
  To: git; +Cc: Mark Brown, gitster

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>
---
 git-am.sh |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/git-am.sh b/git-am.sh
index 3c08d53..ebfbee5 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
-- 
1.7.0

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2010-02-22 14:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20100222140911.30949.49607.reportbug@rakim.wolfsonmicro.main>
2010-02-22 14:35 ` [PATCH] am: remove rebase-apply directory before gc Jonathan Nieder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).