diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t4007-rename-3.sh | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (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/t4007-rename-3.sh')
-rwxr-xr-x | third_party/git/t/t4007-rename-3.sh | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/third_party/git/t/t4007-rename-3.sh b/third_party/git/t/t4007-rename-3.sh deleted file mode 100755 index b187b7f6c66b..000000000000 --- a/third_party/git/t/t4007-rename-3.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2005 Junio C Hamano -# - -test_description='Rename interaction with pathspec. - -' -. ./test-lib.sh -. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash - -test_expect_success 'prepare reference tree' ' - mkdir path0 path1 && - cp "$TEST_DIRECTORY"/diff-lib/COPYING path0/COPYING && - git update-index --add path0/COPYING && - tree=$(git write-tree) && - echo $tree -' - -blob=$(git hash-object "$TEST_DIRECTORY/diff-lib/COPYING") -test_expect_success 'prepare work tree' ' - cp path0/COPYING path1/COPYING && - git update-index --add --remove path0/COPYING path1/COPYING -' - -# In the tree, there is only path0/COPYING. In the cache, path0 and -# path1 both have COPYING and the latter is a copy of path0/COPYING. -# Comparing the full tree with cache should tell us so. - -cat >expected <<EOF -:100644 100644 $blob $blob C100 path0/COPYING path1/COPYING -EOF - -test_expect_success 'copy detection' ' - git diff-index -C --find-copies-harder $tree >current && - compare_diff_raw current expected -' - -test_expect_success 'copy detection, cached' ' - git diff-index -C --find-copies-harder --cached $tree >current && - compare_diff_raw current expected -' - -# In the tree, there is only path0/COPYING. In the cache, path0 and -# path1 both have COPYING and the latter is a copy of path0/COPYING. -# However when we say we care only about path1, we should just see -# path1/COPYING suddenly appearing from nowhere, not detected as -# a copy from path0/COPYING. - -cat >expected <<EOF -:000000 100644 $ZERO_OID $blob A path1/COPYING -EOF - -test_expect_success 'copy, limited to a subtree' ' - git diff-index -C --find-copies-harder $tree path1 >current && - compare_diff_raw current expected -' - -test_expect_success 'tweak work tree' ' - rm -f path0/COPYING && - git update-index --remove path0/COPYING -' -# In the tree, there is only path0/COPYING. In the cache, path0 does -# not have COPYING anymore and path1 has COPYING which is a copy of -# path0/COPYING. Showing the full tree with cache should tell us about -# the rename. - -cat >expected <<EOF -:100644 100644 $blob $blob R100 path0/COPYING path1/COPYING -EOF - -test_expect_success 'rename detection' ' - git diff-index -C --find-copies-harder $tree >current && - compare_diff_raw current expected -' - -# In the tree, there is only path0/COPYING. In the cache, path0 does -# not have COPYING anymore and path1 has COPYING which is a copy of -# path0/COPYING. When we say we care only about path1, we should just -# see path1/COPYING appearing from nowhere. - -cat >expected <<EOF -:000000 100644 $ZERO_OID $blob A path1/COPYING -EOF - -test_expect_success 'rename, limited to a subtree' ' - git diff-index -C --find-copies-harder $tree path1 >current && - compare_diff_raw current expected -' - -test_done |