mirror of
https://github.com/git/git
synced 2024-10-29 17:08:46 +00:00
660e113ce1
Add an extension to git-diff and git-log (and any other graph-aware displayable output) such that "--line-prefix=<string>" will print the additional line-prefix on every line of output. To make this work, we have to fix a few bugs in the graph API that force graph_show_commit_msg to be used only when you have a valid graph. Additionally, we extend the default_diff_output_prefix handler to work even when no graph is enabled. This is somewhat of a hack on top of the graph API, but I think it should be acceptable here. This will be used by a future extension of submodule display which displays the submodule diff as the actual diff between the pre and post commit in the submodule project. Add some tests for both git-log and git-diff to ensure that the prefix is honored correctly. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
29 lines
394 B
Text
29 lines
394 B
Text
$ git diff --line-prefix=abc master master^ side
|
|
abcdiff --cc dir/sub
|
|
abcindex cead32e,7289e35..992913c
|
|
abc--- a/dir/sub
|
|
abc+++ b/dir/sub
|
|
abc@@@ -1,6 -1,4 +1,8 @@@
|
|
abc A
|
|
abc B
|
|
abc +C
|
|
abc +D
|
|
abc +E
|
|
abc +F
|
|
abc+ 1
|
|
abc+ 2
|
|
abcdiff --cc file0
|
|
abcindex b414108,f4615da..10a8a9f
|
|
abc--- a/file0
|
|
abc+++ b/file0
|
|
abc@@@ -1,6 -1,6 +1,9 @@@
|
|
abc 1
|
|
abc 2
|
|
abc 3
|
|
abc +4
|
|
abc +5
|
|
abc +6
|
|
abc+ A
|
|
abc+ B
|
|
abc+ C
|
|
$
|