From: Fredrik Kuivinen Date: Sun, 25 Sep 2005 14:49:02 GMT Subject: [PATCH] More descriptive messages for conflict cases in merges Message-ID: <20050925144902.GC20527@c165.ib.student.liu.se> The merge strategies can give more descriptive error messages for conflict cases if they are given the actual branch names instead of the SHA1s. Signed-off-by: Fredrik Kuivinen --- git-merge.sh | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) c5a902b12ca631d0ca28f914c1b227481d300295 diff --git a/git-merge.sh b/git-merge.sh --- a/git-merge.sh +++ b/git-merge.sh @@ -71,6 +71,7 @@ test "$#" -le 2 && usage ;# we need at l merge_msg="$1" shift +head_arg="$1" head=$(git-rev-parse --verify "$1"^0) || usage shift @@ -86,7 +87,7 @@ echo "$head" >"$GIT_DIR/ORIG_HEAD" case "$#,$common" in *,'') - die "Unable to find common commit between $head and $*" + die "Unable to find common commit between $head_arg and $*" ;; 1,"$1") # If head can reach all the merge then we are up to date. @@ -147,7 +148,7 @@ do } echo "Trying merge strategy $strategy..." wt_strategy=$strategy - git-merge-$strategy $common -- $head "$@" || { + git-merge-$strategy $common -- $head_arg "$@" || { # The backend exits with 1 when conflicts are left to be resolved, # with 2 when it does not handle the given merge at all. @@ -202,7 +203,7 @@ case "$best_strategy" in echo "Rewinding the tree to pristine..." git reset --hard $head echo "Using the $best_strategy to prepare resolving by hand." - git-merge-$best_strategy $common -- $head "$@" + git-merge-$best_strategy $common -- $head_arg "$@" ;; esac for remote