Jonathan Nieder <jrnieder@xxxxxxxxx> writes:
> Ramkumar Ramachandra wrote:
>
>> Change the command-line '--log' option from a boolean option to an
>> integer option
>
> What does "git merge --log=-1" do?
>
> It looks like you have made "git fmt-merge-msg --log=-1" equivalent to
> --log=20, but it might be better to error out or use INT_MAX or
> something (especially because of plans to make -1 mean "infinity"
> later).
Hmm, do we plan on that? It sounds a little bit insane. Erroring it out
would be Ok. How about doing this on top?
builtin/fmt-merge-msg.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 0997c26..7c6e226 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -322,7 +322,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
const char *message = NULL;
struct option options[] = {
{ OPTION_INTEGER, 0, "log", &shortlog_len, "n",
- "populate log with <n> entries from shortlog",
+ "populate log with at most <n> entries from shortlog",
PARSE_OPT_OPTARG, NULL, DEFAULT_MERGE_LOG_LEN },
{ OPTION_INTEGER, 0, "summary", &shortlog_len, "n",
"alias for --log (deprecated)",
@@ -350,7 +350,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
return 0;
}
if (shortlog_len < 0)
- shortlog_len = DEFAULT_MERGE_LOG_LEN;
+ die("Negative --log=%d???", shortlog_len);
if (inpath && strcmp(inpath, "-")) {
in = fopen(inpath, "r");
--
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