From 7f9acb2a16473e5ba6d44231d2fc844ca8bb9817 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 26 Jan 2007 15:09:02 -0800 Subject: git-merge: leave sensible reflog message when used as the first level UI. 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 --- builtin-update-ref.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'builtin-update-ref.c') diff --git a/builtin-update-ref.c b/builtin-update-ref.c index f2506fa976..b34e5987dd 100644 --- a/builtin-update-ref.c +++ b/builtin-update-ref.c @@ -23,6 +23,8 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) 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])) { -- cgit v1.2.1