]> git.ipfire.org Git - thirdparty/git.git/commitdiff
pickaxe: rename variables in has_changes() for brevity
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Mon, 12 Apr 2021 17:15:22 +0000 (19:15 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 May 2021 03:47:31 +0000 (12:47 +0900)
Rename the {one,two}_contains variables to c{1,2}. This will make a
follow-up change easier to read.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diffcore-pickaxe.c

index be0dd683b63a8cd52af2762ef4fc9657f79af005..23362a23597e9e520c2507955034b8c28da910d2 100644 (file)
@@ -108,9 +108,9 @@ static int has_changes(mmfile_t *one, mmfile_t *two,
                       struct diff_options *o,
                       regex_t *regexp, kwset_t kws)
 {
-       unsigned int one_contains = one ? contains(one, regexp, kws) : 0;
-       unsigned int two_contains = two ? contains(two, regexp, kws) : 0;
-       return one_contains != two_contains;
+       unsigned int c1 = one ? contains(one, regexp, kws) : 0;
+       unsigned int c2 = two ? contains(two, regexp, kws) : 0;
+       return c1 != c2;
 }
 
 static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,