Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93. Signed-off-by: Junio C Hamano <junkio@cox.net>
Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Sep 15, 2005 at 17:38 UTC
b4416b432bde78fac057224d14c7e9c85097a152
1 file changed
+1
-1
git-pull.sh
+1
-1
@@ -24,7 +24,7 @@ then
24
die "You need to first update your working tree."
25
fi
26
27
-merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD)
27
+merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
28
merge_name=$(
29
perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \
30
"$GIT_DIR"/FETCH_HEAD