Commits

Anonymous committed b4416b4

Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.
Signed-off-by: Junio C Hamano <junkio@cox.net>

Comments (0)

Files changed (1)

 		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