summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-05-21 17:50:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-28 17:49:19 (GMT)
commit4c785c0edcd09222a812244db04c6fd725e512f3 (patch)
treebb0662fd2ee6889fbe1cdb2cbf21aaa24774e408 /builtin
parent0d0ac3826a3bbb9247e39e12623bbcfdd722f24c (diff)
downloadgit-4c785c0edcd09222a812244db04c6fd725e512f3.zip
git-4c785c0edcd09222a812244db04c6fd725e512f3.tar.gz
git-4c785c0edcd09222a812244db04c6fd725e512f3.tar.bz2
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>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rebase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index b5c99ec..58607a2 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;
}