From c80522e30fdc190f8c8c7fc983bbe040a1b03e93 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 13 Sep 2005 23:49:55 -0700 Subject: [PATCH] Make merge comment git-pull makes for an octopus a bit prettier. Signed-off-by: Junio C Hamano --- git-pull.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index c1b44744..dd36c615 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 '') -- 2.11.0