It used to throw potentially multi-line log message at reflog.
Just record the heads that were given to be merged at the command
line and the action.
Revert the removal of the check in "git-update-ref -m" I made earlier
which was only a work-around for this.
Signed-off-by: Junio C Hamano <junkio@cox.net>
msg = argv[++i];
if (!*msg)
die("Refusing to perform update with empty message.");
+ if (strchr(msg, '\n'))
+ die("Refusing to perform update with \\n in message.");
continue;
}
if (!strcmp("-d", argv[i])) {
SUBDIRECTORY_OK=Yes
. git-sh-setup
-set_reflog_action "merge $*"
require_work_tree
cd_to_toplevel
# All the rest are remote heads
test "$#" = 0 && usage ;# we need at least one remote head.
+set_reflog_action "merge $*"
remoteheads=
for remote