From: Junio C Hamano <gitster@pobox•com>
To: Michael J Gruber <git@drmicha•warpmail.net>
Cc: git@vger•kernel.org, Jeff King <peff@peff•net>,
Michael Schubert <mschub@elegosoft•com>
Subject: Re: [PATCH 2/5] branch: introduce --list argument
Date: Thu, 25 Aug 2011 12:52:41 -0700 [thread overview]
Message-ID: <7vmxexjmk6.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <32d0954697da9ac96cc11af0d8cc1390d93fd037.1314259226.git.git@drmicha.warpmail.net> (Michael J. Gruber's message of "Thu, 25 Aug 2011 10:30:19 +0200")
Michael J Gruber <git@drmicha•warpmail.net> writes:
> @@ -695,12 +696,15 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
>
> argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
> 0);
> - if (!!delete + !!rename + !!force_create > 1)
> + if (!!delete + !!rename + !!force_create + !!list > 1)
> usage_with_options(builtin_branch_usage, options);
>
> + if (argc == 0 || (verbose && argc == 1))
> + list = 1;
> +
I am afraid this is not quite right.
What happens if one of delete/rename/force-create can take a single
argument, or more importantly, if we someday gain another option that can
take zero or one argument and is incompatible with other operating mode?
For example, what happens to this command line with your "git branch":
$ git branch -v -m boo
The first test passes (no explicit --list), and then you violate the "only
one of these operating mode can be set" assertion you made yourself by
flipping list on, no?
It is a good practice to always run the defaulting tweak *before* checking
options that are mutually incompatible, to catch your own mistake in the
tweaking code.
On top of my previous "multiple patterns allowed" tweak, a replacement
patch to this file may look like this. I suspect there should be a better
way to represent the mode in a single variable and enforce that there is
only one chosen, but that is left for another day.
builtin/branch.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 0fa62bd..4243e7c 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -629,7 +629,7 @@ static int opt_parse_merge_filter(const struct option *opt, const char *arg, int
int cmd_branch(int argc, const char **argv, const char *prefix)
{
- int delete = 0, rename = 0, force_create = 0;
+ int delete = 0, rename = 0, force_create = 0, list = 0;
int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0;
int reflog = 0;
enum branch_track track;
@@ -668,6 +668,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
OPT_BIT('m', NULL, &rename, "move/rename a branch and its reflog", 1),
OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
+ OPT_BOOLEAN(0, "list", &list, "list branch names"),
OPT_BOOLEAN('l', NULL, &reflog, "create the branch's reflog"),
OPT__FORCE(&force_create, "force creation (when already exists)"),
{
@@ -710,12 +711,17 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
0);
- if (!!delete + !!rename + !!force_create > 1)
+
+ if (!delete && !rename && !force_create &&
+ (argc == 0 || (verbose && argc)))
+ list = 1;
+
+ if (!!delete + !!rename + !!force_create + !!list > 1)
usage_with_options(builtin_branch_usage, options);
if (delete)
return delete_branches(argc, argv, delete > 1, kinds);
- else if (argc == 0 || (verbose && argc))
+ else if (list)
return print_ref_list(kinds, detached, verbose, abbrev,
with_commit, argv);
else if (rename && (argc == 1))
next prev parent reply other threads:[~2011-08-25 19:52 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-02 17:17 [RFC] branch: list branches by single remote Michael Schubert
2011-08-04 4:06 ` Jeff King
2011-08-16 13:37 ` Michael J Gruber
2011-08-16 14:19 ` Michael Schubert
2011-08-16 15:14 ` Jeff King
2011-08-24 15:14 ` Michael Schubert
2011-08-24 15:37 ` Michael J Gruber
2011-08-24 16:02 ` Michael Schubert
2011-08-24 18:34 ` Junio C Hamano
2011-08-25 2:31 ` Thiago Farina
2011-08-25 18:02 ` Junio C Hamano
2011-08-25 8:29 ` Michael J Gruber
2011-08-25 8:30 ` [PATCH 0/5] RFC: patterns for branch list Michael J Gruber
2011-08-25 8:30 ` [PATCH 1/5] branch: allow pattern arguments Michael J Gruber
2011-08-25 17:54 ` Jeff King
2011-08-25 18:32 ` Junio C Hamano
2011-08-25 19:29 ` Junio C Hamano
2011-08-25 8:30 ` [PATCH 2/5] branch: introduce --list argument Michael J Gruber
2011-08-25 18:34 ` Junio C Hamano
2011-08-25 19:52 ` Junio C Hamano [this message]
2011-08-25 8:30 ` [PATCH 3/5] t6040; test branch -vv Michael J Gruber
2011-08-25 8:30 ` [PATCH 4/5] branch: restructure -v vs. -vv Michael J Gruber
2011-08-25 19:02 ` Junio C Hamano
2011-08-25 8:30 ` [PATCH 5/5] branch: give patchsame count with -vvv Michael J Gruber
2011-08-25 17:53 ` [PATCH 0/5] RFC: patterns for branch list Jeff King
2011-08-26 8:30 ` Michael J Gruber
2011-08-26 16:55 ` Junio C Hamano
2011-09-07 19:53 ` Jeff King
2011-09-08 9:20 ` Michael J Gruber
2011-08-26 14:05 ` [PATCHv2 0/5] " Michael J Gruber
2011-08-26 14:05 ` [PATCHv2 1/5] t6040: test branch -vv Michael J Gruber
2011-08-26 14:05 ` [PATCHv2 2/5] git-tag: introduce long forms for the options Michael J Gruber
2011-08-26 17:11 ` Junio C Hamano
2011-08-28 14:03 ` Michael J Gruber
2011-08-26 14:05 ` [PATCHv2 3/5] git-branch: introduce missing " Michael J Gruber
2011-08-26 17:13 ` Junio C Hamano
2011-08-28 14:05 ` Michael J Gruber
2011-08-26 14:05 ` [PATCHv2 4/5] branch: introduce --list option Michael J Gruber
2011-08-26 17:43 ` Junio C Hamano
2011-08-28 14:37 ` Michael J Gruber
2011-09-07 19:56 ` Jeff King
2011-09-08 9:24 ` Michael J Gruber
2011-09-08 14:25 ` [PATCHv4 0/5] mg/branch-list amendment Michael J Gruber
2011-09-08 14:25 ` [PATCHv4 4/5] branch: introduce --list option Michael J Gruber
2011-09-08 14:25 ` [PATCHv4 5/5] branch: allow pattern arguments Michael J Gruber
2011-09-08 21:03 ` [PATCHv2 4/5] branch: introduce --list option Junio C Hamano
2011-09-08 21:11 ` Jeff King
2011-09-08 21:17 ` Junio C Hamano
2011-09-09 1:08 ` Jeff King
2011-09-09 6:54 ` Michael J Gruber
2011-09-09 16:02 ` Junio C Hamano
2011-09-09 19:29 ` Michael J Gruber
2011-09-09 19:30 ` Jeff King
2011-09-09 19:40 ` [PATCH] t3200: test branch creation with -v Michael J Gruber
2011-09-09 19:43 ` Jeff King
2011-09-09 19:45 ` Jeff King
2011-09-10 13:29 ` Michael J Gruber
2011-09-13 3:57 ` Jeff King
2011-09-13 12:12 ` Michael J Gruber
2011-09-13 16:13 ` [PATCH] t3200: clean up checks for file existence Jeff King
2011-09-13 17:13 ` Junio C Hamano
2011-09-13 17:16 ` Jeff King
2011-08-26 14:05 ` [PATCHv2 5/5] branch: allow pattern arguments Michael J Gruber
2011-08-26 18:45 ` Junio C Hamano
2011-08-28 14:54 ` [PATCHv3 0/5] patterns for branch list Michael J Gruber
2011-08-28 14:54 ` [PATCHv3 1/5] t6040: test branch -vv Michael J Gruber
2011-08-28 14:54 ` [PATCHv3 2/5] git-tag: introduce long forms for the options Michael J Gruber
2011-08-28 14:54 ` [PATCHv3 3/5] git-branch: introduce missing " Michael J Gruber
2011-08-28 14:54 ` [PATCHv3 4/5] branch: introduce --list option Michael J Gruber
2011-08-29 5:55 ` Junio C Hamano
2011-08-29 6:35 ` Michael J Gruber
2011-08-29 6:51 ` Junio C Hamano
2011-08-28 14:54 ` [PATCHv3 5/5] branch: allow pattern arguments Michael J Gruber
2011-09-06 13:10 ` Michael Schubert
2011-09-06 14:21 ` Michael J Gruber
2011-09-06 14:26 ` Sverre Rabbelier
2011-09-06 16:11 ` Michael J Gruber
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=7vmxexjmk6.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=git@drmicha$(echo .)warpmail.net \
--cc=git@vger$(echo .)kernel.org \
--cc=mschub@elegosoft$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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