From: Christian Couder Date: Fri, 28 Aug 2009 04:47:40 GMT Subject: [PATCH v4 10/15] rebase -i: use "git sequencer--helper --fast-forward" Message-ID: <20090828044746.4307.55101.chriscool@tuxfamily.org> In-Reply-To: <20090828043913.4307.34708.chriscool@tuxfamily.org> when fast forwarding, as it removes a few more lines of shell code. Note that in the first hunk of this patch, there was this line: test "a$1" = a-n && output git reset --soft $current_sha1 but the test always failed. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- git-rebase--interactive.sh | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 0041994..7651fd6 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -154,11 +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 - git sequencer--helper --reset-hard $sha1 \ + git sequencer--helper --fast-forward $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 else output git cherry-pick "$@" fi @@ -238,10 +235,8 @@ pick_one_preserving_merges () { done case $fast_forward in t) - output warn "Fast forward to $sha1" - git sequencer--helper --reset-hard $sha1 \ - "$GIT_REFLOG_ACTION" "$VERBOSE" || - die "Cannot fast forward to $sha1" + git sequencer--helper --fast-forward $sha1 \ + "$GIT_REFLOG_ACTION" "$VERBOSE" || exit ;; f) first_parent=$(expr "$new_parents" : ' \([^ ]*\)') -- 1.6.4.271.ge010d