[PATCH 2/3] git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.
- From
Björn Steinbrink <b.steinbrink@gmx.de>
- Date
- Oct 31, 2007, 02:20 UTC
- Message-ID
- <1193797232-1062-2-git-send-email-B.Steinbrink@gmx.de>
- In-Reply-To
- <1193797232-1062-1-git-send-email-B.Steinbrink@gmx.de>
git-cherry-pick doesn't support a strategy paramter, so don't pass one. This means that --strategy for interactive rebases is a no-op for anything but merge commits, but that's still better than being broken. A correct fix would probably need to port the --merge behaviour from plain git-rebase.sh, but I have no clue how to integrate that cleanly.
Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index f667ae8..cc949db 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -116,7 +116,7 @@ pick_one () { sha1=$(git rev-parse --short $sha1) output warn Fast forward to $sha1 else - output git cherry-pick $STRATEGY "$@" + output git cherry-pick "$@" fi } @@ -184,7 +184,7 @@ pick_one_preserving_merges () { fi ;; *) - output git cherry-pick $STRATEGY "$@" || + output git cherry-pick "$@" || die_with_patch $sha1 "Could not pick $sha1" ;; esac
-- 1.5.3.4.456.g072a