From f5d3a6f575b12af88561ad5a3b1fc8f866f49056 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Tue, 17 Aug 2010 02:06:06 -0500 Subject: [PATCH] merge script: forbid merge -s index Some git-merge-* commands are not merge strategies. This is based on v1.6.1-rc1~294^2~7 (builtin-merge: allow using a custom strategy, 2008-07-30) but it is less smart: we just use a hard-coded list of forbidden strategy names. It is okay if this falls out of date, since the code is just an example. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- contrib/examples/git-merge.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index 49d826508..bab3da9ee 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -36,6 +36,7 @@ LF=' all_strategies='recur recursive octopus resolve stupid ours subtree' all_strategies="$all_strategies recursive-ours recursive-theirs" +not_strategies='base file index tree' default_twohead_strategies='recursive' default_octopus_strategies='octopus' no_fast_forward_strategies='subtree ours' @@ -196,6 +197,10 @@ parse_config () { use_strategies="$use_strategies$1 " ;; *) + case " $not_strategies " in + *" $1 "*) + false + esac && type "git-merge-$1" >/dev/null 2>&1 || die "available strategies are: $all_strategies" use_strategies="$use_strategies$1 " -- 2.30.2