about summary refs log tree commit diff
path: root/third_party/git/t/t4131-apply-fake-ancestor.sh
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/t/t4131-apply-fake-ancestor.sh')
-rwxr-xr-xthird_party/git/t/t4131-apply-fake-ancestor.sh42
1 files changed, 0 insertions, 42 deletions
diff --git a/third_party/git/t/t4131-apply-fake-ancestor.sh b/third_party/git/t/t4131-apply-fake-ancestor.sh
deleted file mode 100755
index b1361ce54693..000000000000
--- a/third_party/git/t/t4131-apply-fake-ancestor.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2009 Stephen Boyd
-#
-
-test_description='git apply --build-fake-ancestor handling.'
-
-. ./test-lib.sh
-
-test_expect_success 'setup' '
-	test_commit 1 &&
-	test_commit 2 &&
-	mkdir sub &&
-	test_commit 3 sub/3.t &&
-	test_commit 4
-'
-
-test_expect_success 'apply --build-fake-ancestor' '
-	git checkout 2 &&
-	echo "A" > 1.t &&
-	git diff > 1.patch &&
-	git reset --hard &&
-	git checkout 1 &&
-	git apply --build-fake-ancestor 1.ancestor 1.patch
-'
-
-test_expect_success 'apply --build-fake-ancestor in a subdirectory' '
-	git checkout 3 &&
-	echo "C" > sub/3.t &&
-	git diff > 3.patch &&
-	git reset --hard &&
-	git checkout 4 &&
-	(
-		cd sub &&
-		git apply --build-fake-ancestor 3.ancestor ../3.patch &&
-		test -f 3.ancestor
-	) &&
-	git apply --build-fake-ancestor 3.ancestor 3.patch &&
-	test_cmp sub/3.ancestor 3.ancestor
-'
-
-test_done