global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-09 17:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dd/diff-customize-index-line-abbrev'

Browse Source 
The output from the "diff" family of the commands had abbreviated
object names of blobs involved in the patch, but its length was not
affected by the --abbrev option.  Now it is.

* dd/diff-customize-index-line-abbrev:
  diff: index-line: respect --abbrev in object's name
  t4013: improve diff-post-processor logic
This commit is contained in:
Junio C Hamano
2020-08-31 15:49:46 -07:00
parent 1a753720c3 3046c7f69a
commit 096c948dab
6 changed files with 138 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
t/t4013/diff.diff-tree_--root_-p_--abbrev=10_initial Normal file
View File

@@ -0,0 +1,29 @@
$ git diff-tree --root -p --abbrev=10 initial
444ac553ac7612cc88969031b02b3767fb8a353a
diff --git a/dir/sub b/dir/sub
new file mode 100644
index 0000000000..35d242ba79
--- /dev/null
+++ b/dir/sub
@@ -0,0 +1,2 @@
+A
+B
diff --git a/file0 b/file0
new file mode 100644
index 0000000000..01e79c32a8
--- /dev/null
+++ b/file0
@@ -0,0 +1,3 @@
+1
+2
+3
diff --git a/file2 b/file2
new file mode 100644
index 0000000000..01e79c32a8
--- /dev/null
+++ b/file2
@@ -0,0 +1,3 @@
+1
+2
+3
$

29
t/t4013/diff.diff-tree_--root_-p_--full-index_--abbrev=10_initial Normal file
View File

@@ -0,0 +1,29 @@
$ git diff-tree --root -p --full-index --abbrev=10 initial
444ac553ac7612cc88969031b02b3767fb8a353a
diff --git a/dir/sub b/dir/sub
new file mode 100644
index 0000000000000000000000000000000000000000..35d242ba79ae89ac695e26b3d4c27a8e6f028f9e
--- /dev/null
+++ b/dir/sub
@@ -0,0 +1,2 @@
+A
+B
diff --git a/file0 b/file0
new file mode 100644
index 0000000000000000000000000000000000000000..01e79c32a8c99c557f0757da7cb6d65b3414466d
--- /dev/null
+++ b/file0
@@ -0,0 +1,3 @@
+1
+2
+3
diff --git a/file2 b/file2
new file mode 100644
index 0000000000000000000000000000000000000000..01e79c32a8c99c557f0757da7cb6d65b3414466d
--- /dev/null
+++ b/file2
@@ -0,0 +1,3 @@
+1
+2
+3
$

29
t/t4013/diff.diff-tree_--root_-p_--full-index_initial Normal file
View File

@@ -0,0 +1,29 @@
$ git diff-tree --root -p --full-index initial
444ac553ac7612cc88969031b02b3767fb8a353a
diff --git a/dir/sub b/dir/sub
new file mode 100644
index 0000000000000000000000000000000000000000..35d242ba79ae89ac695e26b3d4c27a8e6f028f9e
--- /dev/null
+++ b/dir/sub
@@ -0,0 +1,2 @@
+A
+B
diff --git a/file0 b/file0
new file mode 100644
index 0000000000000000000000000000000000000000..01e79c32a8c99c557f0757da7cb6d65b3414466d
--- /dev/null
+++ b/file0
@@ -0,0 +1,3 @@
+1
+2
+3
diff --git a/file2 b/file2
new file mode 100644
index 0000000000000000000000000000000000000000..01e79c32a8c99c557f0757da7cb6d65b3414466d
--- /dev/null
+++ b/file2
@@ -0,0 +1,3 @@
+1
+2
+3
$