[PATCH v4 15/15] rebase -i: use "git sequencer--helper --cherry-pick"
- From
Christian Couder <chriscool@tuxfamily.org>
- Date
- Aug 28, 2009, 04:47 UTC
- Message-ID
- <20090828044746.4307.98469.chriscool@tuxfamily.org>
- In-Reply-To
- <20090828043913.4307.34708.chriscool@tuxfamily.org>
instead of "git cherry-pick", as this will make it easier to port "git-rebase--interactive.sh" to C.
This is because we will be able to use the "do_cherry_pick()" added by a previous patch.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- git-rebase--interactive.sh | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 7651fd6..349ca50 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -147,7 +147,8 @@ pick_one () { pick_one_preserving_merges "$@" && return if test ! -z "$REBASE_ROOT" then - output git cherry-pick "$@" + git sequencer--helper --cherry-pick $sha1 \ + "$GIT_REFLOG_ACTION" "$VERBOSE" $no_ff return fi parent_sha1=$(git rev-parse --verify $sha1^) || @@ -157,7 +158,8 @@ pick_one () { git sequencer--helper --fast-forward $sha1 \ "$GIT_REFLOG_ACTION" "$VERBOSE" else - output git cherry-pick "$@" + git sequencer--helper --cherry-pick $sha1 \ + "$GIT_REFLOG_ACTION" "$VERBOSE" $no_ff fi } @@ -269,7 +271,10 @@ pick_one_preserving_merges () { fi ;; *) - output git cherry-pick "$@" || + no_commit= + test "a$1" = "a-n" && no_commit=t + git sequencer--helper --cherry-pick $sha1 \ + "$GIT_REFLOG_ACTION" "$VERBOSE" $no_commit || die_with_patch $sha1 "Could not pick $sha1" ;; esac
-- 1.6.4.271.ge010d