Matthieu Moy wrote:
> +++ b/revision.c
[...]
> @@ -1295,27 +1305,32 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
> revs->pretty_given = 1;
> get_commit_format(arg+8, revs);
> } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
> + /*
> + * Detached form ("--pretty X" as opposed to "--pretty=X")
> + * not allowed, since the argument is optional.
> + */
> revs->verbose_header = 1;
> revs->pretty_given = 1;
> get_commit_format(arg+9, revs);
> } else if (!strcmp(arg, "--show-notes")) {
> revs->show_notes = 1;
> revs->show_notes_given = 1;
> - } else if (!prefixcmp(arg, "--show-notes=")) {
> + } else if ((argcount = diff_long_opt("show-notes", argv, &optarg))) {
Why is this not like the --pretty case?
[...]
> @@ -1343,12 +1358,13 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
> revs->abbrev = 0;
> } else if (!strcmp(arg, "--abbrev")) {
> revs->abbrev = DEFAULT_ABBREV;
> - } else if (!prefixcmp(arg, "--abbrev=")) {
> - revs->abbrev = strtoul(arg + 9, NULL, 10);
> + } else if ((argcount = diff_long_opt("abbrev", argv, &optarg))) {
> + revs->abbrev = strtoul(optarg, NULL, 10);
Likewise.
> + test_must_fail git log -1 --pretty="tformat:%s" --grep
Thanks for checking an edge case.
With or without the following change,
Reviewed-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
diff --git a/revision.c b/revision.c
index 92035a3..7006340 100644
--- a/revision.c
+++ b/revision.c
@@ -1315,22 +1315,21 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
} else if (!strcmp(arg, "--show-notes")) {
revs->show_notes = 1;
revs->show_notes_given = 1;
- } else if ((argcount = diff_long_opt("show-notes", argv, &optarg))) {
+ } else if (!prefixcmp(arg, "--show-notes=")) {
struct strbuf buf = STRBUF_INIT;
revs->show_notes = 1;
revs->show_notes_given = 1;
if (!revs->notes_opt.extra_notes_refs)
revs->notes_opt.extra_notes_refs = xcalloc(1, sizeof(struct string_list));
- if (!prefixcmp(optarg, "refs/"))
+ if (!prefixcmp(arg+13, "refs/"))
/* happy */;
- else if (!prefixcmp(optarg, "notes/"))
+ else if (!prefixcmp(arg+13, "notes/"))
strbuf_addstr(&buf, "refs/");
else
strbuf_addstr(&buf, "refs/notes/");
- strbuf_addstr(&buf, optarg);
+ strbuf_addstr(&buf, arg+13);
string_list_append(revs->notes_opt.extra_notes_refs,
strbuf_detach(&buf, NULL));
- return argcount;
} else if (!strcmp(arg, "--no-notes")) {
revs->show_notes = 0;
revs->show_notes_given = 1;
@@ -1358,13 +1357,12 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->abbrev = 0;
} else if (!strcmp(arg, "--abbrev")) {
revs->abbrev = DEFAULT_ABBREV;
- } else if ((argcount = diff_long_opt("abbrev", argv, &optarg))) {
- revs->abbrev = strtoul(optarg, NULL, 10);
+ } else if (!prefixcmp(arg, "--abbrev=")) {
+ revs->abbrev = strtoul(arg + 9, NULL, 10);
if (revs->abbrev < MINIMUM_ABBREV)
revs->abbrev = MINIMUM_ABBREV;
else if (revs->abbrev > 40)
revs->abbrev = 40;
- return argcount;
} else if (!strcmp(arg, "--abbrev-commit")) {
revs->abbrev_commit = 1;
} else if (!strcmp(arg, "--full-diff")) {
--
--
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