summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff_--line-prefix=abc_master_master^_side
diff options
context:
space:
mode:
authorJacob Keller <jacob.keller@gmail.com>2016-08-31 23:27:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-01 01:07:09 (GMT)
commit660e113ce11840f4bc4028bff89889e6122fe89a (patch)
treee98e14ea62b3546aad402dcc01a6541de36eb26c /t/t4013/diff.diff_--line-prefix=abc_master_master^_side
parentcd48dadb8d840637f0f55b1ad0d8f50d892c767d (diff)
downloadgit-660e113ce11840f4bc4028bff89889e6122fe89a.zip
git-660e113ce11840f4bc4028bff89889e6122fe89a.tar.gz
git-660e113ce11840f4bc4028bff89889e6122fe89a.tar.bz2
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=abc_master_master^_side')
-rw-r--r--t/t4013/diff.diff_--line-prefix=abc_master_master^_side29
1 files changed, 29 insertions, 0 deletions
diff --git a/t/t4013/diff.diff_--line-prefix=abc_master_master^_side b/t/t4013/diff.diff_--line-prefix=abc_master_master^_side
new file mode 100644
index 0000000..99f91e7
--- /dev/null
+++ b/t/t4013/diff.diff_--line-prefix=abc_master_master^_side
@@ -0,0 +1,29 @@
+$ 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
+$