@matheusbsbs / matheus-bagliano / commits / 2a9c53e03d
Fork 0

git-rebase--interactive.sh: Don't pass a strategy to git-cherry-pick.

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> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Björn Steinbrink committed Oct 31, 2007 at 03:20 UTC 2a9c53e03d8293577b5163910f178075725b39dd
1 file changed +2 -2
git-rebase--interactive.sh
+2 -2
@@ -109,7 +109,7 @@ pick_one () {
109 sha1=$(git rev-parse --short $sha1)
110 output warn Fast forward to $sha1
111 else
112 - output git cherry-pick $STRATEGY "$@"
112 + output git cherry-pick "$@"
113 fi
114 }
115
@@ -173,7 +173,7 @@ pick_one_preserving_merges () {
173 fi
174 ;;
175 *)
176 - output git cherry-pick $STRATEGY "$@" ||
176 + output git cherry-pick "$@" ||
177 die_with_patch $sha1 "Could not pick $sha1"
178 esac
179 esac