diff options
| author |  Jacob Keller <jacob.keller@gmail.com> | 2016-08-31 16:27:20 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-08-31 18:07:09 -0700 |
| commit | 660e113ce11840f4bc4028bff89889e6122fe89a (patch) | |
| tree | e98e14ea62b3546aad402dcc01a6541de36eb26c /t/t4013/diff.diff_--line-prefix_--cached_--_file0 | |
| parent | diff.c: remove output_prefix_length field (diff) | |
| download | tgif-660e113ce11840f4bc4028bff89889e6122fe89a.tar.xz | |
graph: add support for --line-prefix on all graph-aware output
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>
Diffstat (limited to 't/t4013/diff.diff_--line-prefix_--cached_--_file0')
| -rw-r--r-- | t/t4013/diff.diff_--line-prefix_--cached_--_file0 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4013/diff.diff_--line-prefix_--cached_--_file0 b/t/t4013/diff.diff_--line-prefix_--cached_--_file0 new file mode 100644 index 0000000000..f41ba4d36a --- /dev/null +++ b/t/t4013/diff.diff_--line-prefix_--cached_--_file0 @@ -0,0 +1,15 @@ +| | | diff --git a/file0 b/file0 +| | | new file mode 100644 +| | | index 0000000..10a8a9f +| | | --- /dev/null +| | | +++ b/file0 +| | | @@ -0,0 +1,9 @@ +| | | +1 +| | | +2 +| | | +3 +| | | +4 +| | | +5 +| | | +6 +| | | +A +| | | +B +| | | +C |