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>
brian m. carlson committed
Dec 21, 2019 at 19:49 UTC
215b60bf079758405e4f396a2e68a00ec4d9e011
1 file changed
+5
-5
t/t4066-diff-emit-delay.sh
+5
-5
@@ -18,7 +18,7 @@ test_expect_success 'set up history with a merge' '
18
'
19
20
test_expect_success 'log --cc -p --stat --color-moved' '
21
- cat >expect <<-\EOF &&
21
+ cat >expect <<-EOF &&
22
commit D
23
---
24
D.t | 1 +
@@ -26,7 +26,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '
26
27
diff --git a/D.t b/D.t
28
new file mode 100644
29
- index 0000000..1784810
29
+ index 0000000..$(git rev-parse --short D:D.t)
30
--- /dev/null
31
+++ b/D.t
32
@@ -0,0 +1 @@
@@ -42,7 +42,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '
42
43
diff --git a/C.t b/C.t
44
new file mode 100644
45
- index 0000000..3cc58df
45
+ index 0000000..$(git rev-parse --short C:C.t)
46
--- /dev/null
47
+++ b/C.t
48
@@ -0,0 +1 @@
@@ -54,7 +54,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '
54
55
diff --git a/B.t b/B.t
56
new file mode 100644
57
- index 0000000..223b783
57
+ index 0000000..$(git rev-parse --short B:B.t)
58
--- /dev/null
59
+++ b/B.t
60
@@ -0,0 +1 @@
@@ -66,7 +66,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '
66
67
diff --git a/A.t b/A.t
68
new file mode 100644
69
- index 0000000..f70f10e
69
+ index 0000000..$(git rev-parse --short A:A.t)
70
--- /dev/null
71
+++ b/A.t
72
@@ -0,0 +1 @@