Revert breakage introduced by c80522e.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git · Sep 16, 2005 · b4416b4 · b4416b4
1 parent 316eee8
commit b4416b4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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