submodule: display summary header in bold
Currently, 'git diff --submodule' displays output with a bold diff header for non-submodules. So this part is in bold: diff --git a/file1 b/file1 index 30b2f6c..2638038 100644 --- a/file1 +++ b/file1 For submodules, the header looks like this: Submodule submodule1 012b072..248d0fd: Unfortunately, it's easy to miss in the output because it's not bold. Change this. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra committed
Nov 13, 2012 at 21:12 UTC
4e215131d2543a28a065c5161438c315316f9961
3 files changed
+6
-6
diff.c
+1
-1
@@ -2259,7 +2259,7 @@ static void builtin_diff(const char *name_a,
2259
const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
2260
show_submodule_summary(o->file, one ? one->path : two->path,
2261
one->sha1, two->sha1, two->dirty_submodule,
2262
- del, add, reset);
2262
+ meta, del, add, reset);
2263
return;
2264
}
2265
submodule.c
+4
-4
@@ -258,7 +258,7 @@ int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg)
258
259
void show_submodule_summary(FILE *f, const char *path,
260
unsigned char one[20], unsigned char two[20],
261
- unsigned dirty_submodule,
261
+ unsigned dirty_submodule, const char *meta,
262
const char *del, const char *add, const char *reset)
263
{
264
struct rev_info rev;
@@ -292,15 +292,15 @@ void show_submodule_summary(FILE *f, const char *path,
292
return;
293
}
294
295
- strbuf_addf(&sb, "Submodule %s %s..", path,
295
+ strbuf_addf(&sb, "%sSubmodule %s %s..", meta, path,
296
find_unique_abbrev(one, DEFAULT_ABBREV));
297
if (!fast_backward && !fast_forward)
298
strbuf_addch(&sb, '.');
299
strbuf_addf(&sb, "%s", find_unique_abbrev(two, DEFAULT_ABBREV));
300
if (message)
301
- strbuf_addf(&sb, " %s\n", message);
301
+ strbuf_addf(&sb, " %s%s\n", message, reset);
302
else
303
- strbuf_addf(&sb, "%s:\n", fast_backward ? " (rewind)" : "");
303
+ strbuf_addf(&sb, "%s:%s\n", fast_backward ? " (rewind)" : "", reset);
304
fwrite(sb.buf, sb.len, 1, f);
305
306
if (!message) {
submodule.h
+1
-1
@@ -20,7 +20,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
20
int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
21
void show_submodule_summary(FILE *f, const char *path,
22
unsigned char one[20], unsigned char two[20],
23
- unsigned dirty_submodule,
23
+ unsigned dirty_submodule, const char *meta,
24
const char *del, const char *add, const char *reset);
25
void set_config_fetch_recurse_submodules(int value);
26
void check_for_new_submodule_commits(unsigned char new_sha1[20]);