summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-13 23:49:55 -0700
committerJunio C Hamano <junkio@cox.net>2005-09-13 23:49:55 -0700
commitc80522e30fdc190f8c8c7fc983bbe040a1b03e93 (patch)
treedfb28d0e12d69486c776dbacca98c33b8afc9a5a /git-pull.sh
parent2ba6c47be1762726ad0c1d5779064c489150d789 (diff)
downloadgit-c80522e30fdc190f8c8c7fc983bbe040a1b03e93.tar.gz
Make merge comment git-pull makes for an octopus a bit prettier.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/git-pull.sh b/git-pull.sh
index c1b4474495..dd36c615b6 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -24,9 +24,11 @@ then
die "You need to first update your working tree."
fi
-merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
-merge_name=$(sed -e 's/^[0-9a-f]* //' "$GIT_DIR"/FETCH_HEAD |
- tr '\012' ' ')
+merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD)
+merge_name=$(
+ perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \
+ "$GIT_DIR"/FETCH_HEAD
+)
case "$merge_head" in
'')