summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-16 00:38:26 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-16 00:38:26 (GMT)
commitb4416b432bde78fac057224d14c7e9c85097a152 (patch)
tree769ea142915ad9567bc49d859c350417d54c4b93 /git-pull.sh
parent316eee8fe0282a6f14441b0045a32871bdf90d36 (diff)
downloadgit-b4416b432bde78fac057224d14c7e9c85097a152.zip
git-b4416b432bde78fac057224d14c7e9c85097a152.tar.gz
git-b4416b432bde78fac057224d14c7e9c85097a152.tar.bz2
Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index dd36c61..8cf39e7 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