From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 7/8] rebase --merge: return control to caller, for housekeeping
Date: Fri, 10 May 2013 19:56:44 +0530 [thread overview]
Message-ID: <1368196005-5354-8-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1368196005-5354-1-git-send-email-artagnon@gmail.com>
Return control to the caller git-rebase.sh to get these two tasks
rm -fr "$dotest"
git gc --auto
done by it.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
git-rebase--merge.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index b10f2cf..16d1817 100644
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -96,7 +96,6 @@ finish_rb_merge () {
"$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
fi
fi
- rm -r "$state_dir"
say All done.
}
@@ -110,7 +109,7 @@ continue)
continue_merge
done
finish_rb_merge
- exit
+ return
;;
skip)
read_state
@@ -122,7 +121,7 @@ skip)
continue_merge
done
finish_rb_merge
- exit
+ return
;;
esac
--
1.8.3.rc1.52.gc14258d
next prev 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 ` [PATCH 4/8] rebase: prepare to do generic housekeeping Ramkumar Ramachandra
2013-05-10 14:33 ` 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 ` Ramkumar Ramachandra [this message]
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-8-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).