undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Log ref changes made by resolve.

Browse Source 
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>
This commit is contained in:
Shawn Pearce 2006-07-11 02:25:09 -04:00 committed by Junio C Hamano
parent 09a28eccce
commit 5a6852fef1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git-resolve.sh
View File

@ -15,6 +15,7 @@ dropheads() {
head=$(git-rev-parse --verify "$1"^0) && head=$(git-rev-parse --verify "$1"^0) &&
merge=$(git-rev-parse --verify "$2"^0) && merge=$(git-rev-parse --verify "$2"^0) &&
merge_name="$2" &&
merge_msg="$3" || usage merge_msg="$3" || usage
# #
@ -43,7 +44,8 @@ case "$common" in
"$head") "$head")
echo "Updating from $head to $merge" echo "Updating from $head to $merge"
git-read-tree -u -m $head $merge || exit 1 git-read-tree -u -m $head $merge || exit 1
git-update-ref HEAD "$merge" "$head" git-update-ref -m "resolve $merge_name: Fast forward" \
HEAD "$merge" "$head"
git-diff-tree -p $head $merge | git-apply --stat git-diff-tree -p $head $merge | git-apply --stat
dropheads dropheads
exit 0 exit 0
@ -100,6 +102,7 @@ if [ $? -ne 0 ]; then
fi fi
result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge) result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)
echo "Committed merge $result_commit" echo "Committed merge $result_commit"
git-update-ref HEAD "$result_commit" "$head" git-update-ref -m "resolve $merge_name: In-index merge" \
HEAD "$result_commit" "$head"
git-diff-tree -p $head $result_commit | git-apply --stat git-diff-tree -p $head $result_commit | git-apply --stat
dropheads dropheads