From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>,
Daniel Barkalow <barkalow@iabervon.org>,
Jakub Narebski <jnareb@gmail.com>
Subject: [PATCH v2 4/4] rebase -i: use "git sequencer--helper --reset-hard"
Date: Wed, 05 Aug 2009 22:53:00 +0200 [thread overview]
Message-ID: <20090805205301.3673.71764.chriscool@tuxfamily.org> (raw)
instead of "git reset --hard"
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
git-rebase--interactive.sh | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index c9c75c0..0041994 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -154,7 +154,8 @@ pick_one () {
die "Could not get the parent of $sha1"
current_sha1=$(git rev-parse --verify HEAD)
if test "$no_ff$current_sha1" = "$parent_sha1"; then
- output git reset --hard $sha1
+ git sequencer--helper --reset-hard $sha1 \
+ "$GIT_REFLOG_ACTION" "$VERBOSE"
test "a$1" = a-n && output git reset --soft $current_sha1
sha1=$(git rev-parse --short $sha1)
output warn Fast forward to $sha1
@@ -238,7 +239,8 @@ pick_one_preserving_merges () {
case $fast_forward in
t)
output warn "Fast forward to $sha1"
- output git reset --hard $sha1 ||
+ git sequencer--helper --reset-hard $sha1 \
+ "$GIT_REFLOG_ACTION" "$VERBOSE" ||
die "Cannot fast forward to $sha1"
;;
f)
@@ -536,7 +538,8 @@ first and then run 'git rebase --continue' again."
git symbolic-ref HEAD $HEADNAME
;;
esac &&
- output git reset --hard $HEAD &&
+ git sequencer--helper --reset-hard $HEAD \
+ "$GIT_REFLOG_ACTION" "$VERBOSE" &&
rm -rf "$DOTEST"
exit
;;
@@ -548,7 +551,9 @@ first and then run 'git rebase --continue' again."
git rerere clear
test -d "$DOTEST" || die "No interactive rebase running"
- output git reset --hard && do_rest
+ git sequencer--helper --reset-hard HEAD \
+ "$GIT_REFLOG_ACTION" "$VERBOSE" &&
+ do_rest
;;
-s)
case "$#,$1" in
--
1.6.4.133.g8a5c8
reply other threads:[~2009-08-05 21:32 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20090805205301.3673.71764.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=s-beyer@gmx.net \
/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).