From: Ramkumar Ramachandra Date: Fri, 20 Aug 2010 19:15:01 GMT Subject: [PATCH v3 4/5] fmt-merge-msg: Remove deprecated --summary option Message-ID: <1282331702-5115-5-git-send-email-artagnon@gmail.com> In-Reply-To: <1282331702-5115-1-git-send-email-artagnon@gmail.com> Remove the deprecated --summary option that served as a syonym to the --log option. Signed-off-by: Ramkumar Ramachandra --- Documentation/git-fmt-merge-msg.txt | 4 ---- builtin/fmt-merge-msg.c | 13 ++----------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt index 302f56b..78c8a6d 100644 --- a/Documentation/git-fmt-merge-msg.txt +++ b/Documentation/git-fmt-merge-msg.txt @@ -55,10 +55,6 @@ merge.log:: Whether to include summaries of merged commits in newly merge commit messages. False by default. -merge.summary:: - Synonym to `merge.log`; this is deprecated and will be removed in - the future. - SEE ALSO -------- linkgit:git-merge[1] diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index 64c52bd..adab21e 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -15,18 +15,12 @@ static int log_limit = 0; static int fmt_merge_msg_config(const char *key, const char *value, void *cb) { - static int found_merge_log = 0; int is_bool = 0; if (!strcmp("merge.log", key)) { - found_merge_log = 1; log_limit = git_config_bool_or_int(key, value, &is_bool); + if (is_bool && log_limit) + log_limit = 20; } - if (!found_merge_log && !strcmp("merge.summary", key)) - log_limit = git_config_bool_or_int(key, value, &is_bool); - - if (is_bool && log_limit) - log_limit = 20; - return 0; } @@ -329,9 +323,6 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix) { OPTION_INTEGER, 0, "log", &log_limit, "n", "populate log with entries from shortlog", PARSE_OPT_NOARG, NULL, 20 }, - { OPTION_INTEGER, 0, "summary", &log_limit, "n", - "alias for --log (deprecated)", - PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 20 }, OPT_STRING('m', "message", &message, "text", "use as start of message"), OPT_FILENAME('F', "file", &inpath, "file to read from"), -- 1.7.2.2.409.gdbb11.dirty