mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Revert breakage introduced by c80522e30f
.
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
316eee8fe0
commit
b4416b432b
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue