git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 4/8] rebase: prepare to do generic housekeeping
Date: Fri, 10 May 2013 19:56:41 +0530	[thread overview]
Message-ID: <1368196005-5354-5-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1368196005-5354-1-git-send-email-artagnon@gmail.com>

On successful completion of a rebase in git-rebase--$backend.sh, the
$backend script cleans up on its own and exits.  The cleanup routine
is however, independent of the $backend, and each $backend script
unnecessarily duplicates this work:

    rm -rf "$state_dir"
    git gc --auto

Prepare git-rebase.sh for later patches that return control from each
$backend script back to us, for performing this generic cleanup
routine.

Another advantage is that git-rebase.sh can implement a generic
finish_rebase() to possibly do additional tasks in addition to the
cleanup.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 git-rebase.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/git-rebase.sh b/git-rebase.sh
index 2c692c3..84dc7b0 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -150,6 +150,13 @@ run_specific_rebase () {
 		autosquash=
 	fi
 	. git-rebase--$type
+	ret=$?
+	if test $ret = 0
+	then
+		git gc --auto &&
+		rm -rf "$state_dir"
+	fi
+	exit $ret
 }
 
 run_pre_rebase_hook () {
-- 
1.8.3.rc1.52.gc14258d

  parent reply	other threads:[~2013-05-10 14:25 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-10 14:26 [PATCH v2 0/8] rebase.autostash completed Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 1/8] am: suppress error output from a conditional Ramkumar Ramachandra
2013-05-10 14:46   ` Junio C Hamano
2013-05-11 23:38     ` Ramkumar Ramachandra
2013-05-12  3:09       ` Junio C Hamano
2013-05-10 14:26 ` [PATCH 2/8] rebase -i: don't error out if $state_dir already exists Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 3/8] am: tighten a conditional that checks for $dotest Ramkumar Ramachandra
2013-05-10 14:26 ` Ramkumar Ramachandra [this message]
2013-05-10 14:33   ` [PATCH 4/8] rebase: prepare to do generic housekeeping Eric Sunshine
2013-05-10 15:18     ` Junio C Hamano
2013-05-10 15:32   ` Junio C Hamano
2013-05-10 16:39     ` Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 5/8] am: return control to caller, for housekeeping Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 6/8] rebase -i: " Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 7/8] rebase --merge: " Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 8/8] rebase: implement --[no-]autostash and rebase.autostash Ramkumar Ramachandra
2013-05-10 14:41   ` Eric Sunshine
2013-05-10 15:29   ` Junio C Hamano

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=1368196005-5354-5-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --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).