From 7f9acb2a16473e5ba6d44231d2fc844ca8bb9817 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
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 <junkio@cox.net>
---
 git-merge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git-merge.sh')

diff --git a/git-merge.sh b/git-merge.sh
index 7b590268ed..656869101a 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -7,7 +7,6 @@ USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commi
 
 SUBDIRECTORY_OK=Yes
 . git-sh-setup
-set_reflog_action "merge $*"
 require_work_tree
 cd_to_toplevel
 
@@ -217,6 +216,7 @@ head=$(git-rev-parse --verify "$head_arg"^0) || usage
 
 # All the rest are remote heads
 test "$#" = 0 && usage ;# we need at least one remote head.
+set_reflog_action "merge $*"
 
 remoteheads=
 for remote
-- 
cgit v1.2.1