X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-merge.sh;h=e50fbb1160ad6ccfebc0d65fcc54bc3488e597cd;hb=c5ced64578a82b9d172aceb2f67c6fb9e639f6d9;hp=d352a3cf65e45e0da0a8ee1989e9acb522e132b5;hpb=56fc63193975edd4b9f520b6c65c2b97ecd8ee38;p=git.git diff --git a/git-merge.sh b/git-merge.sh index d352a3cf..e50fbb11 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -3,15 +3,13 @@ # Copyright (c) 2005 Junio C Hamano # + +USAGE='[-n] [--no-commit] [-s ]... +' . git-sh-setup LF=' ' -usage () { - die "git-merge [-n] [--no-commit] [-s ]... +" -} - all_strategies='recursive octopus resolve stupid ours' default_strategies='recursive' use_strategies= @@ -97,11 +95,14 @@ head=$(git-rev-parse --verify "$1"^0) || usage shift # All the rest are remote heads +remoteheads= for remote do - git-rev-parse --verify "$remote"^0 >/dev/null || + remotehead=$(git-rev-parse --verify "$remote"^0) || die "$remote - not something we can merge" + remoteheads="${remoteheads}$remotehead " done +set x $remoteheads ; shift case "$#" in 1) @@ -273,7 +274,8 @@ fi case "$best_strategy" in '') restorestate - die "No merge strategy handled the merge." + echo >&2 "No merge strategy handled the merge." + exit 2 ;; "$wt_strategy") # We already have its result in the working tree.