git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/2] rebase: replace incorrect logical negation by correct bitwise one

From
Junio C Hamano <gitster@pobox.com>
Date
May 28, 2019, 18:25 UTC
Message-ID
<xmqq5zpu308g.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<aa0acf4c5ff843a480afdb5715fa03186d82a6d1.1558461018.git.gitgitgadget@gmail.com>

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 25 quoted lines
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> In bff014dac7d9 (builtin rebase: support the `verbose` and `diffstat`
> options, 2018-09-04), we added a line that wanted to remove the
> `REBASE_DIFFSTAT` bit from the flags, but it used an incorrect negation.
>
> Found by Coverity.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>  builtin/rebase.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index ba3a574e40..db6ca9bd7d 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1203,7 +1203,7 @@ static int rebase_config(const char *var, const char *value, void *data)
>  		if (git_config_bool(var, value))
>  			opts->flags |= REBASE_DIFFSTAT;
>  		else
> -			opts->flags &= !REBASE_DIFFSTAT;
> +			opts->flags &= ~REBASE_DIFFSTAT;
>  		return 0;
>  	}
Obviously correct.  Thanks.

At this point in the codeflow, the .flags field is not touched by parse_options() yet, the configuration codepath only touches that field for REBASE_DIFFSTAT, and because REBASE_DIFFSTAT is not 0, "[rebase] stat = no", which would want only the REBASE_DIFFSTAT bit cleared in the word, can afford to instead assign 0 to the whole word without causing any damage, which is funny way for this bug to be hidden for a long time...

Previous: Johannes Schindelin via GitGitGadgetNext: Johannes Schindelin via GitGitGadget
Message 3 of 4 in “Fix two issues pointed out by Coverity”
  1. 0/2 Fix two issues pointed out by CoverityJohannes Schindelin via GitGitGadget, May 21, 2019
  2. 1/2 rebase: replace incorrect logical negation by correct bitwise oneJohannes Schindelin via GitGitGadget, May 21, 2019
  3. Junio C HamanoMay 28, 2019
  4. 2/2 bisect--helper: verify HEAD could be parsed before continuingJohannes Schindelin via GitGitGadget, May 21, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.