Revert breakage introduced by c80522e3.

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

Revert breakage introduced by c80522e3.
Signed-off-by: N Junio C Hamano <junkio@cox.net>
b4416b43 · Junio C Hamano · 316eee8f · b4416b43
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

git-pull.sh git-pull.sh +1 -1

未找到文件。
--- 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