From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH v4 10/15] rebase -i: use "git sequencer--helper --fast-forward" Date: Fri, 28 Aug 2009 06:47:40 +0200 Message-ID: <20090828044746.4307.55101.chriscool@tuxfamily.org> References: <20090828043913.4307.34708.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Johannes Schindelin , Stephan Beyer , Daniel Barkalow , Jakub Narebski To: Junio C Hamano X-From: git-owner@vger.kernel.org Fri Aug 28 07:00:42 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1MgtZl-0006Ec-NB for gcvg-git-2@lo.gmane.org; Fri, 28 Aug 2009 07:00:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751855AbZH1E7d (ORCPT ); Fri, 28 Aug 2009 00:59:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751713AbZH1E7b (ORCPT ); Fri, 28 Aug 2009 00:59:31 -0400 Received: from smtp3-g21.free.fr ([212.27.42.3]:49767 "EHLO smtp3-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751703AbZH1E7N (ORCPT ); Fri, 28 Aug 2009 00:59:13 -0400 Received: from smtp3-g21.free.fr (localhost [127.0.0.1]) by smtp3-g21.free.fr (Postfix) with ESMTP id 1E61F8180F7; Fri, 28 Aug 2009 06:59:04 +0200 (CEST) Received: from bureau.boubyland (gre92-7-82-243-130-161.fbx.proxad.net [82.243.130.161]) by smtp3-g21.free.fr (Postfix) with ESMTP id D1DF68180A0; Fri, 28 Aug 2009 06:59:01 +0200 (CEST) X-git-sha1: a2e95c99a2255067cf3836242653f1b6b4c7b97b X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20090828043913.4307.34708.chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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