git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: Stefan Beller <stefanbeller@googlemail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCHv2 8/9] checkout-index: Fix negations of even numbers of -n
Date: Wed, 31 Jul 2013 13:16:39 -0400	[thread overview]
Message-ID: <CAPig+cTQV=2OFg_4OSFzkYWE8Uxz0ErWgXKOoV6mUWEMT65F4w@mail.gmail.com> (raw)
In-Reply-To: <1375288117-1576-9-git-send-email-stefanbeller@googlemail.com>

On Wed, Jul 31, 2013 at 12:28 PM, Stefan Beller
<stefanbeller@googlemail.com> wrote:
> The --no-create was parsed with OPT_BOOLEAN, which has a counting up
> logic implemented. Since b04ba2bb (parse-options: deprecate OPT_BOOLEAN,
> 2011-09-27) the OPT_BOOLEAN is deprecated and is only a define:
>         /* Deprecated synonym */
>         #define OPTION_BOOLEAN OPTION_COUNTUP
>
> However the variable not_new, which can be counted up by giving multiple
> --no-create multiple times, is used to set a bit in the struct checkout

s/multiple --no-create multiple times/--no-create multiple times/

> bitfield (defined in cache.h:969, declared at builtin/checkout-index.c:19):
>
>         state.not_new = not_new;
>
> When assigning a value other than 0 or 1 to a bit, all leading digits but
> the last are ignored and only the last bit is used for setting the bit
> variable.
>
> Hence the following:
>         # in git.git:
>         $ git status
>         # working directory clean
>         rm COPYING
>         $ git status
>         # deleted:    COPYING
>         $ git checkout-index -a -n
>         # deleted:    COPYING
>         # which is expected as we're telling git to not restore or create
>         # files, however:
>         $ git checkout-index -a -n -n
>         $ git status
>         # working directory clean, COPYING is restored again!
>         # That's the bug, we're fixing here.
>
> By restraining the variable not_new to a value being definitely 0 or 1
> by the macro OPT_BOOL the bug is fixed.
>
> Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>

  reply	other threads:[~2013-07-31 17:16 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-31 16:28 [PATCHv2 0/9] Removing deprecated parsing macros Stefan Beller
2013-07-31 16:28 ` [PATCHv2 1/9] Remove deprecated OPTION_BOOLEAN for parsing arguments Stefan Beller
2013-07-31 16:28 ` [PATCHv2 2/9] Replace deprecated OPT_BOOLEAN by OPT_BOOL Stefan Beller
2013-07-31 16:28 ` [PATCHv2 3/9] log, format-patch: parsing uses OPT__QUIET Stefan Beller
2013-07-31 17:08   ` Eric Sunshine
2013-07-31 16:28 ` [PATCHv2 4/9] checkout: remove superfluous local variable Stefan Beller
2013-07-31 16:28 ` [PATCHv2 5/9] branch, commit, name-rev: ease up boolean conditions Stefan Beller
2013-07-31 16:28 ` [PATCHv2 6/9] hash-object: Replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP Stefan Beller
2013-07-31 17:12   ` Eric Sunshine
2013-07-31 16:28 ` [PATCHv2 7/9] config: parsing options: config file flag multiple times Stefan Beller
2013-07-31 16:28 ` [PATCHv2 8/9] checkout-index: Fix negations of even numbers of -n Stefan Beller
2013-07-31 17:16   ` Eric Sunshine [this message]
2013-07-31 17:21   ` Eric Sunshine
2013-07-31 16:28 ` [PATCHv2 9/9] revert: use the OPT_CMDMODE for parsing, reducing code Stefan Beller

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='CAPig+cTQV=2OFg_4OSFzkYWE8Uxz0ErWgXKOoV6mUWEMT65F4w@mail.gmail.com' \
    --to=sunshine@sunshineco.com \
    --cc=git@vger.kernel.org \
    --cc=stefanbeller@googlemail.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).