diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2009-12-11 16:38:57 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-13 23:17:46 -0800 |
| commit | 81334502eed1c78f49fc74936b712b3cf32b682a (patch) | |
| tree | e8e6fc594f99af01c830fd1b95132674c18b84fd /git-merge-octopus.sh | |
| parent | 9861b644e045b5ee0e16dea65b44419205090960 (diff) | |
| download | git-81334502eed1c78f49fc74936b712b3cf32b682a.tar.gz | |
octopus: make merge process simpler to follow
Its not very easy to understand what heads are being merged given
the current output of an octopus merge. Fix this by replacing the
sha1 with the (usually) better description in GITHEAD_<SHA1>.
Suggested-by: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index 1dadbb4966..3bb1acd527 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -61,12 +61,13 @@ do exit 2 esac + eval pretty_name=\${GITHEAD_$SHA1:-$SHA1} common=$(git merge-base --all $SHA1 $MRC) || - die "Unable to find common commit with $SHA1" + die "Unable to find common commit with $pretty_name" case "$LF$common$LF" in *"$LF$SHA1$LF"*) - echo "Already up-to-date with $SHA1" + echo "Already up-to-date with $pretty_name" continue ;; esac @@ -81,7 +82,7 @@ do # tree as the intermediate result of the merge. # We still need to count this as part of the parent set. - echo "Fast forwarding to: $SHA1" + echo "Fast-forwarding to: $pretty_name" git read-tree -u -m $head $SHA1 || exit MRC=$SHA1 MRT=$(git write-tree) continue @@ -89,7 +90,7 @@ do NON_FF_MERGE=1 - echo "Trying simple merge with $SHA1" + echo "Trying simple merge with $pretty_name" git read-tree -u -m --aggressive $common $MRT $SHA1 || exit 2 next=$(git write-tree 2>/dev/null) if test $? -ne 0 |