mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Log ref changes made by git-merge and git-pull.
When git-merge updates HEAD as a result of a merge record what happened during the merge into the reflog associated with HEAD (if any). The log reports who caused the update (git-merge or git-pull, by invoking git-merge), what the remote ref names were and the type of merge process used. The merge information can be useful when reviewing a reflog for a branch such as `master` where fast forward and trivial in index merges might be common as the user tracks an upstream. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
ed0e078f96
commit
e1447e38c0
17
git-merge.sh
17
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
|
||||
|
|
|
@ -102,5 +102,6 @@ case "$strategy_args" in
|
|||
esac
|
||||
|
||||
merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
|
||||
git-merge $no_summary $no_commit $squash $strategy_args \
|
||||
git-merge "--reflog-action=pull $*" \
|
||||
$no_summary $no_commit $squash $strategy_args \
|
||||
"$merge_name" HEAD $merge_head
|
||||
|
|
Loading…
Reference in a new issue