From b4416b432bde78fac057224d14c7e9c85097a152 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 15 Sep 2005 17:38:26 -0700 Subject: [PATCH] Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93. Signed-off-by: Junio C Hamano --- git-pull.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-pull.sh b/git-pull.sh index dd36c615b..8cf39e7f6 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 -- 2.30.2