about summary refs log tree commit diff
path: root/third_party/git/t/t4066-diff-emit-delay.sh
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/t/t4066-diff-emit-delay.sh')
-rwxr-xr-xthird_party/git/t/t4066-diff-emit-delay.sh79
1 files changed, 0 insertions, 79 deletions
diff --git a/third_party/git/t/t4066-diff-emit-delay.sh b/third_party/git/t/t4066-diff-emit-delay.sh
deleted file mode 100755
index 5df6b5e64e..0000000000
--- a/third_party/git/t/t4066-diff-emit-delay.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-
-test_description='test combined/stat/moved interaction'
-. ./test-lib.sh
-
-# This test covers a weird 3-way interaction between "--cc -p", which will run
-# the combined diff code, along with "--stat", which will be computed as a
-# first-parent stat during the combined diff, and "--color-moved", which
-# enables the emitted_symbols list to store the diff in memory.
-
-test_expect_success 'set up history with a merge' '
-	test_commit A &&
-	test_commit B &&
-	git checkout -b side HEAD^ &&
-	test_commit C &&
-	git merge -m M master &&
-	test_commit D
-'
-
-test_expect_success 'log --cc -p --stat --color-moved' '
-	cat >expect <<-\EOF &&
-	commit D
-	---
-	 D.t | 1 +
-	 1 file changed, 1 insertion(+)
-
-	diff --git a/D.t b/D.t
-	new file mode 100644
-	index 0000000..1784810
-	--- /dev/null
-	+++ b/D.t
-	@@ -0,0 +1 @@
-	+D
-	commit M
-
-	 B.t | 1 +
-	 1 file changed, 1 insertion(+)
-	commit C
-	---
-	 C.t | 1 +
-	 1 file changed, 1 insertion(+)
-
-	diff --git a/C.t b/C.t
-	new file mode 100644
-	index 0000000..3cc58df
-	--- /dev/null
-	+++ b/C.t
-	@@ -0,0 +1 @@
-	+C
-	commit B
-	---
-	 B.t | 1 +
-	 1 file changed, 1 insertion(+)
-
-	diff --git a/B.t b/B.t
-	new file mode 100644
-	index 0000000..223b783
-	--- /dev/null
-	+++ b/B.t
-	@@ -0,0 +1 @@
-	+B
-	commit A
-	---
-	 A.t | 1 +
-	 1 file changed, 1 insertion(+)
-
-	diff --git a/A.t b/A.t
-	new file mode 100644
-	index 0000000..f70f10e
-	--- /dev/null
-	+++ b/A.t
-	@@ -0,0 +1 @@
-	+A
-	EOF
-	git log --format="commit %s" --cc -p --stat --color-moved >actual &&
-	test_cmp expect actual
-'
-
-test_done