From: Stefan Beller <stefanbeller@googlemail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, sunshine@sunshineco.com
Subject: Re: [PATCHv3 0/9] Removing deprecated parsing macros
Date: Tue, 06 Aug 2013 15:02:14 +0200 [thread overview]
Message-ID: <5200F3D6.5040004@googlemail.com> (raw)
In-Reply-To: <7v4nb3iaqb.fsf@alter.siamese.dyndns.org>
[-- Attachment #1: Type: text/plain, Size: 1141 bytes --]
On 08/06/2013 08:39 AM, Junio C Hamano wrote:
> Thanks. Queued this at the tip of 'pu'. There seem to be some
> fallouts found in the test suite, though.
>
Thanks. I am sorry for forgetting 'make test' before sending patches.
And the test suite is correct.
e35ea450 (branch, commit, name-rev: ease up boolean conditions)
is faulty. In builtin/branch.c the variables 'delete' and 'rename'
are not used as a true boolean but I assumed so.
These are parsed in via OPT_BIT and depending if you pass -d or -D
for deletion you have value 1 or 2 in delete.
Hence this change is incorrect:
- if (!!delete + !!rename + !!force_create + !!list + !!new_upstream + !!unset_upstream > 1)
+ if (delete + rename + force_create + list + unset_upstream +
+ !!new_upstream > 1)
usage_with_options(builtin_branch_usage, options);
The current patch e35ea450 ([PATCHv3 5/9] branch, commit, name-rev: ease up boolean conditions)
can be dropped/reverted and I'll resend it. (The order doesn't matter,
you can just drop that commit and apply the resend version on top of
origin/sb/parseopt-boolean-removal
Stefan
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 899 bytes --]
next prev parent reply other threads:[~2013-08-06 13:02 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-03 11:51 [PATCHv3 0/9] Removing deprecated parsing macros Stefan Beller
2013-08-03 11:51 ` [PATCHv3 1/9] Remove deprecated OPTION_BOOLEAN for parsing arguments Stefan Beller
2013-08-03 11:51 ` [PATCHv3 2/9] Replace deprecated OPT_BOOLEAN by OPT_BOOL Stefan Beller
2013-08-03 11:51 ` [PATCHv3 3/9] log, format-patch: parsing uses OPT__QUIET Stefan Beller
2013-08-03 11:51 ` [PATCHv3 4/9] checkout: remove superfluous local variable Stefan Beller
2013-08-03 11:51 ` [PATCHv3 5/9] branch, commit, name-rev: ease up boolean conditions Stefan Beller
2013-08-03 11:51 ` [PATCHv3 6/9] hash-object: Replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP Stefan Beller
2013-08-05 18:50 ` Junio C Hamano
2013-08-03 11:51 ` [PATCHv3 7/9] config parsing options: allow one flag multiple times Stefan Beller
2013-08-05 18:52 ` Junio C Hamano
2013-08-03 11:51 ` [PATCHv3 8/9] checkout-index: Fix negations of even numbers of -n Stefan Beller
2013-08-03 11:51 ` [PATCHv3 9/9] revert: use the OPT_CMDMODE for parsing, reducing code Stefan Beller
2013-08-03 11:55 ` [PATCHv3 0/9] Removing deprecated parsing macros Stefan Beller
2013-08-06 6:39 ` Junio C Hamano
2013-08-06 13:02 ` Stefan Beller [this message]
2013-08-06 13:07 ` [PATCH] branch, commit, name-rev: ease up boolean conditions Stefan Beller
2013-08-06 18:46 ` Eric Sunshine
2013-08-06 20:18 ` Stefan Beller
2013-08-06 20:18 ` Stefan Beller
2013-08-06 17:20 ` [PATCHv3 0/9] Removing deprecated parsing macros Junio C Hamano
2013-08-06 23:31 ` [PATCH 0/4] Update built-in parseopt macros Junio C Hamano
2013-08-06 23:31 ` [PATCH 1/4] OPT__QUIET(): switch from count-up to true bool Junio C Hamano
2013-08-06 23:31 ` [PATCH 2/4] OPT__VERBOSE(): clarify its expected use by using OPT_COUNTUP Junio C Hamano
2013-08-06 23:31 ` [PATCH 3/4] OPT__DRY_RUN(): use OPT_BOOL, not OPT_BOOLEAN Junio C Hamano
2013-08-06 23:31 ` [RFH/PATCH 4/4] OPT__FORCE(): clarify its expected use by using OPT_COUNTUP Junio C Hamano
2013-08-07 7:33 ` Stefan Beller
2013-08-07 15:28 ` Junio C Hamano
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=5200F3D6.5040004@googlemail.com \
--to=stefanbeller@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.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.
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).