Also remove related test.
Signed-off-by: SZEDER Gábor <szeder@xxxxxxxxxx>
---
Documentation/git-fmt-merge-msg.txt | 9 ---------
Documentation/merge-config.txt | 3 ---
builtin-fmt-merge-msg.c | 12 +++---------
t/t6200-fmt-merge-msg.sh | 8 +-------
4 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt
index 6e23e6c..4d0ca4c 100644
--- a/Documentation/git-fmt-merge-msg.txt
+++ b/Documentation/git-fmt-merge-msg.txt
@@ -33,12 +33,6 @@ OPTIONS
Do not list one-line descriptions from the actual commits being
merged.
---summary::
- Deprecated equivalent of --log.
-
---no-summary::
- Deprecated equivalent of --no-log.
-
--file <file>, -F <file>::
Take the list of merged objects from <file> instead of
stdin.
@@ -50,9 +44,6 @@ merge.log::
Whether to include summaries of merged commits in newly
merge commit messages. False by default.
-merge.summary::
- Deprecated equivalent of merge.log.
-
SEE ALSO
--------
linkgit:git-merge[1]
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 896f914..9719311 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -6,9 +6,6 @@ merge.log::
Whether to include summaries of merged commits in newly created
merge commit messages. False by default.
-merge.summary::
- Deprecated equivalent of merge.log.
-
merge.tool::
Controls which merge resolution program is used by
linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3",
diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index d49f545..0bf87c1 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -12,12 +12,7 @@ static int merge_summary;
static int fmt_merge_msg_config(const char *key, const char *value)
{
- 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))
+ if (!strcmp("merge.log", key))
merge_summary = git_config_bool(key, value);
return 0;
}
@@ -255,10 +250,9 @@ 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], "--log") || !strcmp(argv[1], "--summary"))
+ if (!strcmp(argv[1], "--log"))
merge_summary = 1;
- else if (!strcmp(argv[1], "--no-log")
- || !strcmp(argv[1], "--no-summary"))
+ else if (!strcmp(argv[1], "--no-log"))
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 926ca50..d844661 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -108,7 +108,7 @@ EOF
test_expect_success 'merge-msg test #3' '
- git config merge.summary true &&
+ git config merge.log true &&
git checkout master &&
setdate &&
@@ -138,7 +138,6 @@ EOF
test_expect_success 'merge-msg test #4' '
- git config --unset merge.summary &&
git config merge.log true &&
git checkout master &&
@@ -177,11 +176,6 @@ test_expect_success 'merge-msg command line options #2' '
git diff actual msg.left.log
'
-test_expect_success 'merge-msg deprecated command line options' '
- git fmt-merge-msg --summary <.git/FETCH_HEAD >actual &&
- git diff actual msg.left.log
-'
-
test_expect_success 'merge-msg command line option overrides config #1' '
git config merge.log true &&
--
1.5.5.76.g546c
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
