From: Junio C Hamano <junkio@cox.net>
Date: Fri, 16 Sep 2005 00:38:26 +0000 (-0700)
Subject: Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.
X-Git-Tag: v0.99.7~27
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=b4416b432bde78fac057224d14c7e9c85097a152;p=git.git

Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

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