git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v4 06/15] rebase -i: use "git sequencer--helper --reset-hard"
Date: Fri, 28 Aug 2009 06:47:36 +0200	[thread overview]
Message-ID: <20090828044746.4307.71321.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20090828043913.4307.34708.chriscool@tuxfamily.org>

instead of "git reset --hard"

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 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.271.ge010d

  parent reply	other threads:[~2009-08-28  5:00 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-08-28  4:47 [PATCH v4 00/15] complete reroll of my "port rebase -i to C" series Christian Couder
2009-08-28  4:47 ` [PATCH v4 01/15] sequencer: add "builtin-sequencer--helper.c" Christian Couder
2009-08-28  4:47 ` [PATCH v4 02/15] sequencer: add "make_patch" function to save a patch Christian Couder
2009-08-28  4:47 ` [PATCH v4 03/15] rebase -i: use "git sequencer--helper --make-patch" Christian Couder
2009-08-28  4:47 ` [PATCH v4 04/15] sequencer: add "reset_almost_hard()" and related functions Christian Couder
2009-08-28  6:08   ` Eric Raible
2009-08-28  4:47 ` [PATCH v4 05/15] sequencer: add "--reset-hard" option to "git sequencer--helper" Christian Couder
2009-08-28  4:47 ` Christian Couder [this message]
2009-08-28  4:47 ` [PATCH v4 07/15] sequencer: add "do_fast_forward()" to perform a fast forward Christian Couder
2009-08-28  4:47 ` [PATCH v4 08/15] sequencer: add "--fast-forward" option to "git sequencer--helper" Christian Couder
2009-08-28  4:47 ` [PATCH v4 09/15] sequencer: let "git sequencer--helper" callers set "allow_dirty" Christian Couder
2009-08-28  4:47 ` [PATCH v4 10/15] rebase -i: use "git sequencer--helper --fast-forward" Christian Couder
2009-08-28  4:47 ` [PATCH v4 11/15] revert: libify cherry-pick and revert functionnality Christian Couder
2009-08-28  4:47 ` [PATCH v4 12/15] pick: libify "pick_help_msg()" Christian Couder
2009-08-28  4:47 ` [PATCH v4 13/15] sequencer: add "do_commit()" and related functions working on "next_commit" Christian Couder
2009-08-28  4:47 ` [PATCH v4 14/15] sequencer: add "--cherry-pick" option to "git sequencer--helper" Christian Couder
2009-08-28  4:47 ` [PATCH v4 15/15] rebase -i: use "git sequencer--helper --cherry-pick" Christian Couder

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=20090828044746.4307.71321.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).