X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=git-resolve-script;h=fffcb07df3d020592c79de189ea2d762b0df7232;hb=07ee0d77c66d6f356cd3f82435e67510779aa53c;hp=03c15a98b0527375d34f3369ab1cadb2f6bfc82c;hpb=b33e9666082ce692e64ccfd688dc2a5075566f75;p=git.git diff --git a/git-resolve-script b/git-resolve-script index 03c15a98..fffcb07d 100755 --- a/git-resolve-script +++ b/git-resolve-script @@ -8,7 +8,7 @@ head=$(git-rev-parse --revs-only "$1") merge=$(git-rev-parse --revs-only "$2") -merge_repo="$3" +merge_msg="$3" dropheads() { rm -f -- "$GIT_DIR/MERGE_HEAD" \ @@ -19,8 +19,8 @@ dropheads() { # The remote name is just used for the message, # but we do want it. # -if [ -z "$head" -o -z "$merge" -o -z "$merge_repo" ]; then - die "git-resolve-script " +if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then + die "git-resolve-script " fi dropheads @@ -47,7 +47,6 @@ if [ "$common" == "$head" ]; then fi echo "Trying to merge $merge into $head" git-read-tree -u -m $common $head $merge || exit 1 -merge_msg="Merge $merge_repo" result_tree=$(git-write-tree 2> /dev/null) if [ $? -ne 0 ]; then echo "Simple merge failed, trying Automatic merge"