diff options
| -rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index dd36c615b6..8cf39e7f64 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 |