diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-19 11:33:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-19 11:33:58 -0800 |
| commit | 8d7fefaac4318ac3155368f475e10f97714ebd47 (patch) | |
| tree | 225f9c262ffa4d1bcd58a2b407df396594a711cb /t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side | |
| parent | Merge branch 'tg/worktree-create-tracking' (diff) | |
| parent | t2020: test variations that matter (diff) | |
| download | git-8d7fefaac4318ac3155368f475e10f97714ebd47.tar.gz git-8d7fefaac4318ac3155368f475e10f97714ebd47.zip | |
Merge branch 'ar/unconfuse-three-dots'
Ancient part of codebase still shows dots after an abbreviated
object name just to show that it is not a full object name, but
these ellipses are confusing to people who newly discovered Git
who are used to seeing abbreviated object names and find them
confusing with the range syntax.
* ar/unconfuse-three-dots:
t2020: test variations that matter
t4013: test new output from diff --abbrev --raw
diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value
t4013: prepare for upcoming "diff --raw --abbrev" output format change
checkout: describe_detached_head: remove ellipsis after committish
print_sha1_ellipsis: introduce helper
Documentation: user-manual: limit usage of ellipsis
Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").
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 0000000000..8d1f1e3721 --- /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 +$ |