diff options
author | Junio C Hamano <junkio@cox.net> | 2006-07-17 12:08:11 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-17 12:08:11 +0400 |
commit | b9718d41c7e9c171e432bafac97a33be36f0e2bf (patch) | |
tree | 22f2ceb1019de1fa335e4f31f5fa61f84b231f13 /git-merge.sh | |
parent | 7b520e62a2738ce776d1c9f11144021ff1fc63b6 (diff) | |
parent | 8ef1c7c77d3e5950a839d9ae348827fa288a9a11 (diff) |
Merge branch 'sp/reflog'v1.4.2-rc1
* sp/reflog:
Record rebase changes as 'rebase' in the reflog.
Log ref changes made by resolve.
Log ref changes made by quiltimport.
Log ref changes made by git-merge and git-pull.
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-x | git-merge.sh | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/git-merge.sh b/git-merge.sh index 24e3b507ef..a9cfafb1df 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -58,7 +58,13 @@ squash_message () { } finish () { - test '' = "$2" || echo "$2" + if test '' = "$2" + then + rlogm="$rloga" + else + echo "$2" + rlogm="$rloga: $2" + fi case "$squash" in t) echo "Squash commit -- not updating HEAD" @@ -70,7 +76,7 @@ finish () { echo "No merge message -- not updating HEAD" ;; *) - git-update-ref HEAD "$1" "$head" || exit 1 + git-update-ref -m "$rlogm" HEAD "$1" "$head" || exit 1 ;; esac ;; @@ -88,6 +94,7 @@ finish () { esac } +rloga= while case "$#" in 0) break ;; esac do case "$1" in @@ -117,6 +124,9 @@ do die "available strategies are: $all_strategies" ;; esac ;; + --reflog-action=*) + rloga=`expr "z$1" : 'z-[^=]*=\(.*\)'` + ;; -*) usage ;; *) break ;; esac @@ -131,6 +141,7 @@ shift # All the rest are remote heads test "$#" = 0 && usage ;# we need at least one remote head. +test "$rloga" = '' && rloga="merge: $@" remoteheads= for remote @@ -316,7 +327,7 @@ if test '' != "$result_tree" then parents=$(git-show-branch --independent "$head" "$@" | sed -e 's/^/-p /') result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree $parents) || exit - finish "$result_commit" "Merge $result_commit, made by $wt_strategy." + finish "$result_commit" "Merge made by $wt_strategy." dropsave exit 0 fi |