[PATCH 18/24] merge script: forbid merge -s index
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Aug 17, 2010, 07:06 UTC
- Message-ID
- <20100817070606.GR22057@burratino>
- In-Reply-To
- <20100817065147.GA18293@burratino>
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 <jrnieder@gmail.com> --- contrib/examples/git-merge.sh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index 49d8265..bab3da9 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 "
-- 1.7.2.1.544.ga752d.dirty