diff options
| author |  Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-08 17:38:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-08 17:38:44 -0700 |
| commit | 3ba513c32e7b9102187d94d1c43f33d9559fb334 (patch) | |
| tree | 8121f48b07e68ea9fb3e5c1c7b6d4b68b915bca5 | |
| parent | [PATCH] Use SHA1 for git-update-cache --refresh (diff) | |
| download | tgif-3ba513c32e7b9102187d94d1c43f33d9559fb334.tar.xz | |
Make "git resolve" take the merge message in $3
It used to do "Merge $3" as the message, but that ends up being
inconvenient, and much more easily done inside git-pull-script instead.
This makes the third argument to "git resolve" much easier to explain.
| -rwxr-xr-x | git-pull-script | 2 | ||||
| -rwxr-xr-x | git-resolve-script | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/git-pull-script b/git-pull-script index 0ef6be3547..8e309fc98b 100755 --- a/git-pull-script +++ b/git-pull-script @@ -22,4 +22,4 @@ git-fetch-script "$merge_repo" "$merge_head" || exit 1 git-resolve-script \ "$(cat "$GIT_DIR"/HEAD)" \ "$(cat "$GIT_DIR"/FETCH_HEAD)" \ - "$merge_name" + "Merge $merge_name" diff --git a/git-resolve-script b/git-resolve-script index 03c15a98b0..fffcb07df3 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 <head> <remote> <merge-repo-name>" +if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then + die "git-resolve-script <head> <remote> <merge-message>" 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" |