git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Siddharth Kannan <kannan.siddharth12@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Matthieu.Moy@imag.fr, pranit.bauva@gmail.com,
	peff@peff.net, pclouds@gmail.com,
	sandals@crustytoothpaste.ath.cx,
	Siddharth Kannan <kannan.siddharth12@gmail.com>
Subject: [PATCH 3/4 v4] revision.c: args starting with "-" might be a revision
Date: Thu, 16 Feb 2017 15:14:13 +0000	[thread overview]
Message-ID: <1487258054-32292-4-git-send-email-kannan.siddharth12@gmail.com> (raw)
In-Reply-To: <1487258054-32292-1-git-send-email-kannan.siddharth12@gmail.com>

setup_revisions used to consider any argument starting with "-" to be either a
valid or an unknown option.

Teach setup_revisions to check if an argument is a revision before adding it as
an unknown option (something that setup_revisions didn't understand) to argv,
and moving on to the next argument.

This patch prepares the addition of "-" as a shorthand for "previous branch".

Signed-off-by: Siddharth Kannan <kannan.siddharth12@gmail.com>
---
 revision.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/revision.c b/revision.c
index 8d4ddae..5470c33 100644
--- a/revision.c
+++ b/revision.c
@@ -2203,6 +2203,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 	read_from_stdin = 0;
 	for (left = i = 1; i < argc; i++) {
 		const char *arg = argv[i];
+		int maybe_opt = 0;
 		if (*arg == '-') {
 			int opts;
 
@@ -2232,15 +2233,17 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 			}
 			if (opts < 0)
 				exit(128);
-			/* arg is an unknown option */
-			argv[left++] = arg;
-			continue;
+			maybe_opt = 1;
 		}
 
 
 		if (!handle_revision_arg(arg, revs, flags, revarg_opt))
 			got_rev_arg = 1;
-		else {
+		else if (maybe_opt) {
+			/* arg is an unknown option */
+			argv[left++] = arg;
+			continue;
+		} else {
 			int j;
 			if (seen_dashdash || *arg == '^')
 				die("bad revision '%s'", arg);
-- 
2.1.4


  parent reply	other threads:[~2017-02-16 15:14 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-16 15:14 [PATCH 0/4 v4] WIP: allow "-" as a shorthand for "previous branch" Siddharth Kannan
2017-02-16 15:14 ` [PATCH 1/4 v4] revision.c: do not update argv with unknown option Siddharth Kannan
2017-02-16 16:48   ` Matthieu Moy
2017-02-16 18:11     ` Junio C Hamano
2017-02-16 18:22       ` Matthieu Moy
2017-02-16 19:39         ` Siddharth Kannan
2017-02-16 15:14 ` [PATCH 2/4 v4] revision.c: swap if/else blocks Siddharth Kannan
2017-02-16 15:14 ` Siddharth Kannan [this message]
2017-02-16 15:14 ` [PATCH 4/4 v4] sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}" Siddharth Kannan
2017-02-16 19:08   ` Junio C Hamano
2017-02-20 14:21     ` Siddharth Kannan
2017-02-20 20:30       ` Junio C Hamano
2017-02-22  6:27         ` Siddharth Kannan
2017-02-16 16:41 ` [PATCH 0/4 v4] WIP: allow "-" as a shorthand for "previous branch" Matthieu Moy
2017-02-16 18:49   ` Junio C Hamano
2017-02-16 19:43     ` Siddharth Kannan

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1487258054-32292-4-git-send-email-kannan.siddharth12@gmail.com \
    --to=kannan.siddharth12@gmail.com \
    --cc=Matthieu.Moy@imag.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=pranit.bauva@gmail.com \
    --cc=sandals@crustytoothpaste.ath.cx \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).