X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-pull.sh;h=8cf39e7f6495925c9f9824ebea518810554ba12b;hb=8805ccac40348094d26b3b892c6ca3d08dc12ae0;hp=c1b4474495f883910f50610856c8fc39dad3f89c;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git diff --git a/git-pull.sh b/git-pull.sh index c1b44744..8cf39e7f 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -25,8 +25,10 @@ then 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_name=$( + perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \ + "$GIT_DIR"/FETCH_HEAD +) case "$merge_head" in '')