@@ -1231,7 +1231,7 @@ static void mark_color_as_moved(struct diff_options *o,
&pmb_nr);
if (contiguous && pmb_nr && moved_symbol == l->s)
- flipped_block = (flipped_block + 1) % 2;
+ flipped_block ^= 1;
else
flipped_block = 0;
@@ -188,7 +188,7 @@ static int check_dotfile(const char *x, const char **argv,
int res = 0, expect = 1;
for (; *argv; argv++) {
if (!strcmp("--not", *argv))
- expect = !expect;
+ expect ^= 1;
else if (expect != (is_hfs(*argv) || is_ntfs(*argv)))
res = error("'%s' is %s.git%s", *argv,
expect ? "not " : "", x);