diff options
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-pull.sh b/git-pull.sh index c1b447449..dd36c615b 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 '') |