From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Sep 2005 06:49:55 +0000 (-0700)
Subject: Make merge comment git-pull makes for an octopus a bit prettier.
X-Git-Tag: v0.99.7~44
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c80522e30fdc190f8c8c7fc983bbe040a1b03e93;p=git.git

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 c1b447449..dd36c615b 100755
--- 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
 '')