summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-04-05 17:12:08 +0100
committerJunio C Hamano <gitster@pobox.com>2013-04-05 11:28:10 -0700
commit0f33a0677d6d93b3f6d8fb7d1df62f30eb7b73a9 (patch)
tree62593a3c55617523be0ad8a1d5eb319dc09ff7b8 /diff.c
parentbfd70c53b38f03a4e788fb84518c09f67b7514c2 (diff)
downloadgit-0f33a0677d6d93b3f6d8fb7d1df62f30eb7b73a9.tar.gz
submodule: print graph output next to submodule log
When running "git log -p --submodule=log", the submodule log is not indented by the graph output, although all other lines are. Fix this by prepending the current line prefix to each line of the submodule log. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index db952a5bc7..28a742c248 100644
--- a/diff.c
+++ b/diff.c
@@ -2255,6 +2255,7 @@ static void builtin_diff(const char *name_a,
const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
show_submodule_summary(o->file, one ? one->path : two->path,
+ line_prefix,
one->sha1, two->sha1, two->dirty_submodule,
meta, del, add, reset);
return;