diff: rename "set" variable
Once upon a time the builtin_diff function used one color, and the color variables were called "set" and "reset". Nowadays it is a much longer function and we use several colors (e.g., "add", "del"). Rename "set" to "meta" to show that it is the color for showing diff meta-info (it still does not indicate that it is a "color", but at least it matches the scheme of the other color variables). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Nov 13, 2012 at 21:12 UTC
d9c552f17a28e5ab1b72135038d4888ea02651ea
2 files changed
+21
-6
diff.c
+6
-6
@@ -2238,7 +2238,7 @@ static void builtin_diff(const char *name_a,
2238
mmfile_t mf1, mf2;
2239
const char *lbl[2];
2240
char *a_one, *b_two;
2241
- const char *set = diff_get_color_opt(o, DIFF_METAINFO);
2241
+ const char *meta = diff_get_color_opt(o, DIFF_METAINFO);
2242
const char *reset = diff_get_color_opt(o, DIFF_RESET);
2243
const char *a_prefix, *b_prefix;
2244
struct userdiff_driver *textconv_one = NULL;
@@ -2285,24 +2285,24 @@ static void builtin_diff(const char *name_a,
2285
b_two = quote_two(b_prefix, name_b + (*name_b == '/'));
2286
lbl[0] = DIFF_FILE_VALID(one) ? a_one : "/dev/null";
2287
lbl[1] = DIFF_FILE_VALID(two) ? b_two : "/dev/null";
2288
- strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, set, a_one, b_two, reset);
2288
+ strbuf_addf(&header, "%s%sdiff --git %s %s%s\n", line_prefix, meta, a_one, b_two, reset);
2289
if (lbl[0][0] == '/') {
2290
/* /dev/null */
2291
- strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, set, two->mode, reset);
2291
+ strbuf_addf(&header, "%s%snew file mode %06o%s\n", line_prefix, meta, two->mode, reset);
2292
if (xfrm_msg)
2293
strbuf_addstr(&header, xfrm_msg);
2294
must_show_header = 1;
2295
}
2296
else if (lbl[1][0] == '/') {
2297
- strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, set, one->mode, reset);
2297
+ strbuf_addf(&header, "%s%sdeleted file mode %06o%s\n", line_prefix, meta, one->mode, reset);
2298
if (xfrm_msg)
2299
strbuf_addstr(&header, xfrm_msg);
2300
must_show_header = 1;
2301
}
2302
else {
2303
if (one->mode != two->mode) {
2304
- strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, set, one->mode, reset);
2305
- strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, set, two->mode, reset);
2304
+ strbuf_addf(&header, "%s%sold mode %06o%s\n", line_prefix, meta, one->mode, reset);
2305
+ strbuf_addf(&header, "%s%snew mode %06o%s\n", line_prefix, meta, two->mode, reset);
2306
must_show_header = 1;
2307
}
2308
if (xfrm_msg)
t/t4041-diff-submodule-option.sh
+15
@@ -71,6 +71,21 @@ EOF
71
test_cmp expected actual
72
"
73
74
+test_expect_success 'diff.submodule does not affect plumbing' '
75
+ test_config diff.submodule log &&
76
+ git diff-index -p HEAD >actual &&
77
+ cat >expected <<-EOF &&
78
+ diff --git a/sm1 b/sm1
79
+ new file mode 160000
80
+ index 0000000..a2c4dab
81
+ --- /dev/null
82
+ +++ b/sm1
83
+ @@ -0,0 +1 @@
84
+ +Subproject commit $fullhead1
85
+ EOF
86
+ test_cmp expected actual
87
+'
88
+
89
commit_file sm1 &&
90
head2=$(add_file sm1 foo3)
91