From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead 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 --- third_party/git/t/t2008-checkout-subdir.sh | 82 ------------------------------ 1 file changed, 82 deletions(-) delete mode 100755 third_party/git/t/t2008-checkout-subdir.sh (limited to 'third_party/git/t/t2008-checkout-subdir.sh') diff --git a/third_party/git/t/t2008-checkout-subdir.sh b/third_party/git/t/t2008-checkout-subdir.sh deleted file mode 100755 index eadb9434ae76..000000000000 --- a/third_party/git/t/t2008-checkout-subdir.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2007 David Symonds - -test_description='git checkout from subdirectories' - -. ./test-lib.sh - -test_expect_success setup ' - - echo "base" > file0 && - git add file0 && - mkdir dir1 && - echo "hello" > dir1/file1 && - git add dir1/file1 && - mkdir dir2 && - echo "bonjour" > dir2/file2 && - git add dir2/file2 && - test_tick && - git commit -m "populate tree" - -' - -test_expect_success 'remove and restore with relative path' ' - - ( - cd dir1 && - rm ../file0 && - git checkout HEAD -- ../file0 && - test "base" = "$(cat ../file0)" && - rm ../dir2/file2 && - git checkout HEAD -- ../dir2/file2 && - test "bonjour" = "$(cat ../dir2/file2)" && - rm ../file0 ./file1 && - git checkout HEAD -- .. && - test "base" = "$(cat ../file0)" && - test "hello" = "$(cat file1)" - ) - -' - -test_expect_success 'checkout with empty prefix' ' - - rm file0 && - git checkout HEAD -- file0 && - test "base" = "$(cat file0)" - -' - -test_expect_success 'checkout with simple prefix' ' - - rm dir1/file1 && - git checkout HEAD -- dir1 && - test "hello" = "$(cat dir1/file1)" && - rm dir1/file1 && - git checkout HEAD -- dir1/file1 && - test "hello" = "$(cat dir1/file1)" - -' - -test_expect_success 'checkout with complex relative path' ' - ( - cd dir1 && - rm file1 && - git checkout HEAD -- ../dir1/../dir1/file1 && - test "hello" = "$(cat file1)" - ) -' - -test_expect_success 'relative path outside tree should fail' \ - 'test_must_fail git checkout HEAD -- ../../Makefile' - -test_expect_success 'incorrect relative path to file should fail (1)' \ - 'test_must_fail git checkout HEAD -- ../file0' - -test_expect_success 'incorrect relative path should fail (2)' \ - '( cd dir1 && test_must_fail git checkout HEAD -- ./file0 )' - -test_expect_success 'incorrect relative path should fail (3)' \ - '( cd dir1 && test_must_fail git checkout HEAD -- ../../file0 )' - -test_done -- cgit 1.4.1