about summary refs log tree commit diff
path: root/third_party/git/t/t6405-merge-symlinks.sh
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-21T10·03+0300
committerVincent Ambo <mail@tazj.in>2021-09-21T11·29+0300
commit43b1791ec601732ac31195df96781a848360a9ac (patch)
treedaae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t6405-merge-symlinks.sh
parent2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff)
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping
it in sync with cgit would be easier this way, but it has proven not
to be a big issue.

On the other hand, a vendored copy of git is an annoying maintenance
burden. It is much easier to rebase the single (dottime) patch that we
have.

This removes the vendored copy of git and instead passes the git
source code to cgit via `pkgs.srcOnly`, which includes the applied
patch so that cgit can continue rendering dottime.

Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/t/t6405-merge-symlinks.sh')
-rwxr-xr-xthird_party/git/t/t6405-merge-symlinks.sh62
1 files changed, 0 insertions, 62 deletions
diff --git a/third_party/git/t/t6405-merge-symlinks.sh b/third_party/git/t/t6405-merge-symlinks.sh
deleted file mode 100755
index 6c0a90d044c5..000000000000
--- a/third_party/git/t/t6405-merge-symlinks.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2007 Johannes Sixt
-#
-
-test_description='merging symlinks on filesystem w/o symlink support.
-
-This tests that git merge-recursive writes merge results as plain files
-if core.symlinks is false.'
-
-. ./test-lib.sh
-
-test_expect_success 'setup' '
-	git config core.symlinks false &&
-	>file &&
-	git add file &&
-	git commit -m initial &&
-	git branch b-symlink &&
-	git branch b-file &&
-	l=$(printf file | git hash-object -t blob -w --stdin) &&
-	echo "120000 $l	symlink" | git update-index --index-info &&
-	git commit -m master &&
-	git checkout b-symlink &&
-	l=$(printf file-different | git hash-object -t blob -w --stdin) &&
-	echo "120000 $l	symlink" | git update-index --index-info &&
-	git commit -m b-symlink &&
-	git checkout b-file &&
-	echo plain-file >symlink &&
-	git add symlink &&
-	git commit -m b-file
-'
-
-test_expect_success 'merge master into b-symlink, which has a different symbolic link' '
-	git checkout b-symlink &&
-	test_must_fail git merge master
-'
-
-test_expect_success 'the merge result must be a file' '
-	test_path_is_file symlink
-'
-
-test_expect_success 'merge master into b-file, which has a file instead of a symbolic link' '
-	git reset --hard &&
-	git checkout b-file &&
-	test_must_fail git merge master
-'
-
-test_expect_success 'the merge result must be a file' '
-	test_path_is_file symlink
-'
-
-test_expect_success 'merge b-file, which has a file instead of a symbolic link, into master' '
-	git reset --hard &&
-	git checkout master &&
-	test_must_fail git merge b-file
-'
-
-test_expect_success 'the merge result must be a file' '
-	test_path_is_file symlink
-'
-
-test_done