@matheusbsbs / matheus-bagliano / commits / c80522e30f
Fork 0

Make merge comment git-pull makes for an octopus a bit prettier.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Sep 13, 2005 at 23:49 UTC c80522e30fdc190f8c8c7fc983bbe040a1b03e93
1 file changed +5 -3
git-pull.sh
+5 -3
@@ -24,9 +24,11 @@ then
24 die "You need to first update your working tree."
25 fi
26
27 -merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
28 -merge_name=$(sed -e 's/^[0-9a-f]* //' "$GIT_DIR"/FETCH_HEAD |
29 - tr '\012' ' ')
27 +merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD)
28 +merge_name=$(
29 + perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \
30 + "$GIT_DIR"/FETCH_HEAD
31 +)
32
33 case "$merge_head" in
34 '')