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

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

diff --git a/git-pull.sh b/git-pull.sh
index c1b4474495f883910f50610856c8fc39dad3f89c..dd36c615b60665d128e9dc07c3988d9f2bac3878 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -24,9 +24,11 @@ then
                die "You need to first update your working tree."
 fi
 
-merge_head=$(sed -e 's/        .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
-merge_name=$(sed -e 's/^[0-9a-f]*      //' "$GIT_DIR"/FETCH_HEAD |
-        tr '\012' ' ')
+merge_head=$(sed -e 's/        .*//' "$GIT_DIR"/FETCH_HEAD)
+merge_name=$(
+    perl -e 'print join("; ", map { chomp; s/^[0-9a-f]*        //; $_ } <>)' \
+    "$GIT_DIR"/FETCH_HEAD
+)
 
 case "$merge_head" in
 '')