diff options
| author | Ann T Ropea <bedhanger@gmx.de> | 2017-12-03 21:27:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 15:32:59 (GMT) |
| commit | c2f1d39897535cfc0a6427aa2d5cb32043749397 (patch) | |
| tree | 50c71f4d293354502668b281202a6fce024451dc /t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side | |
| parent | 7cb6ac1e4b5c58b515ca503c972124e8b5a0d9ee (diff) | |
| download | git-c2f1d39897535cfc0a6427aa2d5cb32043749397.zip git-c2f1d39897535cfc0a6427aa2d5cb32043749397.tar.gz git-c2f1d39897535cfc0a6427aa2d5cb32043749397.tar.bz2 | |
t4013: test new output from diff --abbrev --raw
Use newly-introduced finely-grained control to teach the diff-family to
honor the new environment GIT_PRINT_SHA1_ELLIPSIS and remove the
ellipses when it is not set.
Mentored-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ann T Ropea <bedhanger@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side')
| -rw-r--r-- | t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side b/t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side new file mode 100644 index 0000000..8d1f1e3 --- /dev/null +++ b/t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side @@ -0,0 +1,36 @@ +$ git diff --patch-with-raw -r initial..side +:100644 100644 35d242b 7289e35 M dir/sub +:100644 100644 01e79c3 f4615da M file0 +:000000 100644 0000000 7289e35 A file3 + +diff --git a/dir/sub b/dir/sub +index 35d242b..7289e35 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -1,2 +1,4 @@ + A + B ++1 ++2 +diff --git a/file0 b/file0 +index 01e79c3..f4615da 100644 +--- a/file0 ++++ b/file0 +@@ -1,3 +1,6 @@ + 1 + 2 + 3 ++A ++B ++C +diff --git a/file3 b/file3 +new file mode 100644 +index 0000000..7289e35 +--- /dev/null ++++ b/file3 +@@ -0,0 +1,4 @@ ++A ++B ++1 ++2 +$ |