[PATCH 4/6] fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable

["SZEDER Gábor" <szeder@ira.uka.de>]

These are doing the same as the '--(no-)summary' options or the
'merge.summary' config variable, but are consistent with the soon to be
added 'merge --(no-)log' options.  The 'merge.summary' config variable
and '--(no-)summary' options are still accepted, but are not advertised.
'merge.log' takes precedence over 'merge.summary'.

Update documentation and test accordingly.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
 Documentation/git-fmt-merge-msg.txt |   10 +++++-----
 Documentation/merge-config.txt      |    2 +-
 builtin-fmt-merge-msg.c             |   14 ++++++++++----
 t/t6200-fmt-merge-msg.sh            |    6 +++---
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 8615ae3..bf9c26b 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -9,8 +9,8 @@ git-fmt-merge-msg - Produce a merge commit message
 SYNOPSIS
 --------
 [verse]
-git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD
-git-fmt-merge-msg [--summary | --no-summary] -F <file>
+git-fmt-merge-msg [--log | --no-log] <$GIT_DIR/FETCH_HEAD
+git-fmt-merge-msg [--log | --no-log] -F <file>
 
 DESCRIPTION
 -----------
@@ -24,12 +24,12 @@ automatically invoking `git-merge`.
 OPTIONS
 -------
 
---summary::
+--log::
 	In addition to branch names, populate the log message with
 	one-line descriptions from the actual commits that are being
 	merged.
 
---no-summary::
+--no-log::
 	Do not list one-line descriptions from the actual commits being
 	merged.
 
@@ -40,7 +40,7 @@ OPTIONS
 CONFIGURATION
 -------------
 
-merge.summary::
+merge.log::
 	Whether to include summaries of merged commits in newly
 	merge commit messages. False by default.
 
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 6d0a797..9719311 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -2,7 +2,7 @@ merge.stat::
 	Whether to print the diffstat berween ORIG_HEAD and merge result
 	at the end of the merge.  True by default.
 
-merge.summary::
+merge.log::
 	Whether to include summaries of merged commits in newly created
 	merge commit messages. False by default.
 
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index ebb3f37..d49f545 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -6,13 +6,18 @@
 #include "tag.h"
 
 static const char *fmt_merge_msg_usage =
-	"git-fmt-merge-msg [--summary] [--no-summary] [--file <file>]";
+	"git-fmt-merge-msg [--log] [--no-log] [--file <file>]";
 
 static int merge_summary;
 
 static int fmt_merge_msg_config(const char *key, const char *value)
 {
-	if (!strcmp("merge.summary", key))
+	static int found_merge_log = 0;
+	if (!strcmp("merge.log", key)) {
+		found_merge_log = 1;
+		merge_summary = git_config_bool(key, value);
+	}
+	if (!found_merge_log && !strcmp("merge.summary", key))
 		merge_summary = git_config_bool(key, value);
 	return 0;
 }
@@ -250,9 +255,10 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 	git_config(fmt_merge_msg_config);
 
 	while (argc > 1) {
-		if (!strcmp(argv[1], "--summary"))
+		if (!strcmp(argv[1], "--log") || !strcmp(argv[1], "--summary"))
 			merge_summary = 1;
-		else if (!strcmp(argv[1], "--no-summary"))
+		else if (!strcmp(argv[1], "--no-log")
+				|| !strcmp(argv[1], "--no-summary"))
 			merge_summary = 0;
 		else if (!strcmp(argv[1], "-F") || !strcmp(argv[1], "--file")) {
 			if (argc < 3)
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 9f70afc..1a04b89 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -107,7 +107,7 @@ EOF
 
 test_expect_success 'merge-msg test #3' '
 
-	git config merge.summary true &&
+	git config merge.log true &&
 
 	git checkout master &&
 	setdate &&
@@ -137,7 +137,7 @@ EOF
 
 test_expect_success 'merge-msg test #4' '
 
-	git config merge.summary true &&
+	git config merge.log true &&
 
 	git checkout master &&
 	setdate &&
@@ -149,7 +149,7 @@ test_expect_success 'merge-msg test #4' '
 
 test_expect_success 'merge-msg test #5' '
 
-	git config merge.summary yes &&
+	git config merge.log yes &&
 
 	git checkout master &&
 	setdate &&
-- 
1.5.5.rc3.9.gba703