From: Jonathan Nieder <jrnieder@gmail.com>
To: Matthieu Moy <Matthieu.Moy@imag.fr>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH 3/4 v2] Allow detached form (e.g. "git log --grep foo") in log options.
Date: Wed, 28 Jul 2010 21:46:38 -0500 [thread overview]
Message-ID: <20100729024638.GM29156@dert.cs.uchicago.edu> (raw)
In-Reply-To: <1280310062-16793-3-git-send-email-Matthieu.Moy@imag.fr>
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@gmail.com>
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")) {
--
next prev parent reply other threads:[~2010-07-29 2:46 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-27 21:21 [PATCH 0/4] Allow detached forms (--option arg) for git log and friends Matthieu Moy
2010-07-27 21:21 ` [PATCH 1/4] Allow detached form (e.g. "-S foo" instead of "-Sfoo") for diff options Matthieu Moy
2010-07-27 21:37 ` Jonathan Nieder
2010-07-28 7:38 ` Matthieu Moy
2010-07-28 9:40 ` [PATCH 1/4 v2] " Matthieu Moy
2010-07-29 2:00 ` Jonathan Nieder
2010-07-29 7:19 ` Matthieu Moy
2010-07-29 16:54 ` Junio C Hamano
2010-07-28 9:41 ` [PATCH 2/4 v2] Allow detached form for git diff --stat-name-width and --stat-width Matthieu Moy
2010-07-29 2:36 ` Jonathan Nieder
2010-07-29 2:37 ` [PATCH 1/2] diff: split off a function for --stat-* option parsing Jonathan Nieder
2010-07-29 2:38 ` [PATCH 2/2] diff: allow --stat-width n, --stat-name-width n Jonathan Nieder
2010-07-28 9:41 ` [PATCH 3/4 v2] Allow detached form (e.g. "git log --grep foo") in log options Matthieu Moy
2010-07-28 10:11 ` Ævar Arnfjörð Bjarmason
2010-07-28 11:29 ` Matthieu Moy
2010-07-28 12:56 ` Ævar Arnfjörð Bjarmason
2010-07-28 14:00 ` Matthieu Moy
2010-07-28 15:03 ` Ævar Arnfjörð Bjarmason
2010-07-29 2:46 ` Jonathan Nieder [this message]
2010-07-28 9:41 ` [PATCH 4/4 v2] Allow detached form for --glob, --branches, --tags and --remote Matthieu Moy
2010-07-29 2:48 ` Jonathan Nieder
2010-07-27 21:21 ` [PATCH 2/4] Allow detached form for git diff --stat-name-width and --stat-width Matthieu Moy
2010-07-27 21:21 ` [PATCH 3/4] Allow detached form (e.g. "git log --grep foo") in log options Matthieu Moy
2010-07-27 21:21 ` [PATCH 4/4] Allow detached form for --glob, --branches, --tags and --remote Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100729024638.GM29156@dert.cs.uchicago.edu \
--to=jrnieder@gmail.com \
--cc=Matthieu.Moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).