@matheusbsbs / matheus-bagliano / commits / 5a6852fef1
Fork 0

Log ref changes made by resolve.

Since git-resolve is essentially a form of git-merge record any ref updates it makes similiar to how git-merge would record them. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Shawn Pearce committed Jul 11, 2006 at 02:25 UTC 5a6852fef1d76369d6dfcad1a40ca5287bb781a6
1 file changed +5 -2
git-resolve.sh
+5 -2
@@ -15,6 +15,7 @@ dropheads() {
15
16 head=$(git-rev-parse --verify "$1"^0) &&
17 merge=$(git-rev-parse --verify "$2"^0) &&
18 +merge_name="$2" &&
19 merge_msg="$3" || usage
20
21 #
@@ -43,7 +44,8 @@ case "$common" in
44 "$head")
45 echo "Updating from $head to $merge"
46 git-read-tree -u -m $head $merge || exit 1
46 - git-update-ref HEAD "$merge" "$head"
47 + git-update-ref -m "resolve $merge_name: Fast forward" \
48 + HEAD "$merge" "$head"
49 git-diff-tree -p $head $merge | git-apply --stat
50 dropheads
51 exit 0
@@ -100,6 +102,7 @@ if [ $? -ne 0 ]; then
102 fi
103 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
104 echo "Committed merge $result_commit"
103 -git-update-ref HEAD "$result_commit" "$head"
105 +git-update-ref -m "resolve $merge_name: In-index merge" \
106 + HEAD "$result_commit" "$head"
107 git-diff-tree -p $head $result_commit | git-apply --stat
108 dropheads