From: Jon Seymour <jon.seymour@gmail.com>
To: robbat2@gentoo.org, casey@nrlssc.navy.mil, git@vger.kernel.org,
brian@gernhardtsoftware.com
Cc: Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH/RFC v2 2/4] rev-parse: Don't recognise --flags as an option if --no-flags has been specified.
Date: Sat, 25 Sep 2010 19:04:12 +1000 [thread overview]
Message-ID: <1285405454-12521-4-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1285405454-12521-1-git-send-email-jon.seymour@gmail.com>
Previously:
$ git rev-parse --no-flags --flags -X
-X
now:
$ git rev-parse --no-flags --flags -X
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
builtin/rev-parse.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 9e340c7..d403d29 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -520,6 +520,10 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
continue;
}
if (!strcmp(arg, "--flags")) {
+ if (!(filter & DO_FLAGS)) {
+ // --preceding --no-flags means --flags is ignored
+ continue;
+ }
filter &= ~DO_NONFLAGS;
continue;
}
--
1.7.3.1.gc81ce.dirty
next prev parent reply other threads:[~2010-09-25 9:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-25 9:04 [PATCH/RFC v2 0/4] rev-parse: allow --flags to output rev-parse-like flags Jon Seymour
2010-09-25 9:04 ` [PATCH/RFC v2 0/4] *** SUBJECT HERE *** Jon Seymour
2010-09-25 9:04 ` [PATCH/RFC v2 1/4] rev-parse: stop interpreting flags as options to rev-parse once --flags is specified Jon Seymour
2010-09-25 9:04 ` Jon Seymour [this message]
2010-09-25 10:26 ` [PATCH/RFC v2 2/4] rev-parse: Don't recognise --flags as an option if --no-flags has been specified Ævar Arnfjörð Bjarmason
2010-09-25 9:04 ` [PATCH/RFC v2 3/4] rev-parse: add tests for git rev-parse --flags Jon Seymour
2010-09-25 10:29 ` Ævar Arnfjörð Bjarmason
2010-09-25 9:04 ` [PATCH/RFC v2 4/4] rev-parse: update documentation of --flags and --no-flags options Jon Seymour
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=1285405454-12521-4-git-send-email-jon.seymour@gmail.com \
--to=jon.seymour@gmail.com \
--cc=brian@gernhardtsoftware.com \
--cc=casey@nrlssc.navy.mil \
--cc=git@vger.kernel.org \
--cc=robbat2@gentoo.org \
/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).