Merge branch 'js/rebase-config-bitfix'

gitster · gitster · commit 8feb8e27e733 · 2019-05-30T10:50:47.000-07:00
* js/rebase-config-bitfix:
  rebase: replace incorrect logical negation by correct bitwise one
diff --git 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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1203,7 +1203,7 @@ static int rebase_config(const char var, const char value, void *data)`
`1203`	`1203`	`if (git_config_bool(var, value))`
`1204`	`1204`	`opts->flags \|= REBASE_DIFFSTAT;`
`1205`	`1205`	`else`
`1206`		`- opts->flags &= !REBASE_DIFFSTAT;`
	`1206`	`+ opts->flags &= ~REBASE_DIFFSTAT;`
`1207`	`1207`	`return 0;`
`1208`	`1208`	`}`
`1209`	`1209`