diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-05-21 10:50:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-28 10:49:19 -0700 |
| commit | 4c785c0edcd09222a812244db04c6fd725e512f3 (patch) | |
| tree | bb0662fd2ee6889fbe1cdb2cbf21aaa24774e408 | |
| parent | 0d0ac3826a3bbb9247e39e12623bbcfdd722f24c (diff) | |
| download | git-4c785c0edcd09222a812244db04c6fd725e512f3.tar.gz | |
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>
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |