Browse Source

t4066: compute index line in diffs

Since the object ID used in the index line will differ between different
algorithms, compute these values instead of hard-coding them.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
brian m. carlson 5 years ago committed by Junio C Hamano
parent
commit
215b60bf07
  1. 10
      t/t4066-diff-emit-delay.sh

10
t/t4066-diff-emit-delay.sh

@ -18,7 +18,7 @@ test_expect_success 'set up history with a merge' '
' '


test_expect_success 'log --cc -p --stat --color-moved' ' test_expect_success 'log --cc -p --stat --color-moved' '
cat >expect <<-\EOF && cat >expect <<-EOF &&
commit D commit D
--- ---
D.t | 1 + D.t | 1 +
@ -26,7 +26,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '


diff --git a/D.t b/D.t diff --git a/D.t b/D.t
new file mode 100644 new file mode 100644
index 0000000..1784810 index 0000000..$(git rev-parse --short D:D.t)
--- /dev/null --- /dev/null
+++ b/D.t +++ b/D.t
@@ -0,0 +1 @@ @@ -0,0 +1 @@
@ -42,7 +42,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '


diff --git a/C.t b/C.t diff --git a/C.t b/C.t
new file mode 100644 new file mode 100644
index 0000000..3cc58df index 0000000..$(git rev-parse --short C:C.t)
--- /dev/null --- /dev/null
+++ b/C.t +++ b/C.t
@@ -0,0 +1 @@ @@ -0,0 +1 @@
@ -54,7 +54,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '


diff --git a/B.t b/B.t diff --git a/B.t b/B.t
new file mode 100644 new file mode 100644
index 0000000..223b783 index 0000000..$(git rev-parse --short B:B.t)
--- /dev/null --- /dev/null
+++ b/B.t +++ b/B.t
@@ -0,0 +1 @@ @@ -0,0 +1 @@
@ -66,7 +66,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '


diff --git a/A.t b/A.t diff --git a/A.t b/A.t
new file mode 100644 new file mode 100644
index 0000000..f70f10e index 0000000..$(git rev-parse --short A:A.t)
--- /dev/null --- /dev/null
+++ b/A.t +++ b/A.t
@@ -0,0 +1 @@ @@ -0,0 +1 @@

Loading…
Cancel
Save