From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: Mark Brown <broonie@debian.org>, gitster@pobox.com
Subject: [PATCH] am: remove rebase-apply directory before gc
Date: Mon, 22 Feb 2010 08:35:46 -0600 [thread overview]
Message-ID: <20100222143545.GA4791@progeny.tock> (raw)
In-Reply-To: <20100222140911.30949.49607.reportbug@rakim.wolfsonmicro.main>
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
parent reply other threads:[~2010-02-22 14:35 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20100222140911.30949.49607.reportbug@rakim.wolfsonmicro.main>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100222143545.GA4791@progeny.tock \
--to=jrnieder@gmail.com \
--cc=broonie@debian.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).