From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 21 May 2019 17:50:20 +0000 (-0700)
Subject: rebase: replace incorrect logical negation by correct bitwise one
X-Git-Tag: v2.22.0-rc2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c785c0edcd09222a812244db04c6fd725e512f3;p=thirdparty%2Fgit.git

rebase: replace incorrect logical negation by correct bitwise one

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index b5c99ec10c..58607a2019 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -653,7 +653,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;
 	}