Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-02-10 23:52:26 +0300
committerJunio C Hamano <gitster@pobox.com>2017-02-10 23:52:27 +0300
commite53c7f8731f7fa66864397d3d1ec1ad7c035c23a (patch)
tree57b415de5fbe8afd9649d592aa7af9cd10854caa /diff.c
parentdd19bca8270a5f91cd8643055d6316f83017ad72 (diff)
parentf5022b5fedb405c6bbb0b3e7c5a3a7f507279ef5 (diff)
Merge branch 'jk/log-graph-name-only'
"git log --graph" did not work well with "--name-only", even though other forms of "diff" output were handled correctly. * jk/log-graph-name-only: diff: print line prefix for --name-only output
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 d91a344908a..a79f3408da4 100644
--- a/diff.c
+++ b/diff.c
@@ -4450,6 +4450,7 @@ static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
name_a = p->two->path;
name_b = NULL;
strip_prefix(opt->prefix_length, &name_a, &name_b);
+ fprintf(opt->file, "%s", diff_line_prefix(opt));
write_name_quoted(name_a, opt->file, opt->line_termination);
}
}