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/t2004-checkout-cache-temp.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/t2004-checkout-cache-temp.sh')
-rwxr-xr-x | third_party/git/t/t2004-checkout-cache-temp.sh | 221 |
1 files changed, 0 insertions, 221 deletions
diff --git a/third_party/git/t/t2004-checkout-cache-temp.sh b/third_party/git/t/t2004-checkout-cache-temp.sh deleted file mode 100755 index a12afe93f329..000000000000 --- a/third_party/git/t/t2004-checkout-cache-temp.sh +++ /dev/null @@ -1,221 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006 Shawn Pearce -# - -test_description='git checkout-index --temp test. - -With --temp flag, git checkout-index writes to temporary merge files -rather than the tracked path.' - -. ./test-lib.sh - -test_expect_success 'setup' ' - mkdir asubdir && - echo tree1path0 >path0 && - echo tree1path1 >path1 && - echo tree1path3 >path3 && - echo tree1path4 >path4 && - echo tree1asubdir/path5 >asubdir/path5 && - git update-index --add path0 path1 path3 path4 asubdir/path5 && - t1=$(git write-tree) && - rm -f path* .merge_* actual .git/index && - echo tree2path0 >path0 && - echo tree2path1 >path1 && - echo tree2path2 >path2 && - echo tree2path4 >path4 && - git update-index --add path0 path1 path2 path4 && - t2=$(git write-tree) && - rm -f path* .merge_* actual .git/index && - echo tree2path0 >path0 && - echo tree3path1 >path1 && - echo tree3path2 >path2 && - echo tree3path3 >path3 && - git update-index --add path0 path1 path2 path3 && - t3=$(git write-tree) -' - -test_expect_success 'checkout one stage 0 to temporary file' ' - rm -f path* .merge_* actual .git/index && - git read-tree $t1 && - git checkout-index --temp -- path1 >actual && - test_line_count = 1 actual && - test $(cut "-d " -f2 actual) = path1 && - p=$(cut "-d " -f1 actual) && - test -f $p && - test $(cat $p) = tree1path1 -' - -test_expect_success 'checkout all stage 0 to temporary files' ' - rm -f path* .merge_* actual .git/index && - git read-tree $t1 && - git checkout-index -a --temp >actual && - test_line_count = 5 actual && - for f in path0 path1 path3 path4 asubdir/path5 - do - test $(grep $f actual | cut "-d " -f2) = $f && - p=$(grep $f actual | cut "-d " -f1) && - test -f $p && - test $(cat $p) = tree1$f - done -' - -test_expect_success 'setup 3-way merge' ' - rm -f path* .merge_* actual .git/index && - git read-tree -m $t1 $t2 $t3 -' - -test_expect_success 'checkout one stage 2 to temporary file' ' - rm -f path* .merge_* actual && - git checkout-index --stage=2 --temp -- path1 >actual && - test_line_count = 1 actual && - test $(cut "-d " -f2 actual) = path1 && - p=$(cut "-d " -f1 actual) && - test -f $p && - test $(cat $p) = tree2path1 -' - -test_expect_success 'checkout all stage 2 to temporary files' ' - rm -f path* .merge_* actual && - git checkout-index --all --stage=2 --temp >actual && - test_line_count = 3 actual && - for f in path1 path2 path4 - do - test $(grep $f actual | cut "-d " -f2) = $f && - p=$(grep $f actual | cut "-d " -f1) && - test -f $p && - test $(cat $p) = tree2$f - done -' - -test_expect_success 'checkout all stages/one file to nothing' ' - rm -f path* .merge_* actual && - git checkout-index --stage=all --temp -- path0 >actual && - test_line_count = 0 actual -' - -test_expect_success 'checkout all stages/one file to temporary files' ' - rm -f path* .merge_* actual && - git checkout-index --stage=all --temp -- path1 >actual && - test_line_count = 1 actual && - test $(cut "-d " -f2 actual) = path1 && - cut "-d " -f1 actual | (read s1 s2 s3 && - test -f $s1 && - test -f $s2 && - test -f $s3 && - test $(cat $s1) = tree1path1 && - test $(cat $s2) = tree2path1 && - test $(cat $s3) = tree3path1) -' - -test_expect_success 'checkout some stages/one file to temporary files' ' - rm -f path* .merge_* actual && - git checkout-index --stage=all --temp -- path2 >actual && - test_line_count = 1 actual && - test $(cut "-d " -f2 actual) = path2 && - cut "-d " -f1 actual | (read s1 s2 s3 && - test $s1 = . && - test -f $s2 && - test -f $s3 && - test $(cat $s2) = tree2path2 && - test $(cat $s3) = tree3path2) -' - -test_expect_success 'checkout all stages/all files to temporary files' ' - rm -f path* .merge_* actual && - git checkout-index -a --stage=all --temp >actual && - test_line_count = 5 actual -' - -test_expect_success '-- path0: no entry' ' - test x$(grep path0 actual | cut "-d " -f2) = x -' - -test_expect_success '-- path1: all 3 stages' ' - test $(grep path1 actual | cut "-d " -f2) = path1 && - grep path1 actual | cut "-d " -f1 | (read s1 s2 s3 && - test -f $s1 && - test -f $s2 && - test -f $s3 && - test $(cat $s1) = tree1path1 && - test $(cat $s2) = tree2path1 && - test $(cat $s3) = tree3path1) -' - -test_expect_success '-- path2: no stage 1, have stage 2 and 3' ' - test $(grep path2 actual | cut "-d " -f2) = path2 && - grep path2 actual | cut "-d " -f1 | (read s1 s2 s3 && - test $s1 = . && - test -f $s2 && - test -f $s3 && - test $(cat $s2) = tree2path2 && - test $(cat $s3) = tree3path2) -' - -test_expect_success '-- path3: no stage 2, have stage 1 and 3' ' - test $(grep path3 actual | cut "-d " -f2) = path3 && - grep path3 actual | cut "-d " -f1 | (read s1 s2 s3 && - test -f $s1 && - test $s2 = . && - test -f $s3 && - test $(cat $s1) = tree1path3 && - test $(cat $s3) = tree3path3) -' - -test_expect_success '-- path4: no stage 3, have stage 1 and 3' ' - test $(grep path4 actual | cut "-d " -f2) = path4 && - grep path4 actual | cut "-d " -f1 | (read s1 s2 s3 && - test -f $s1 && - test -f $s2 && - test $s3 = . && - test $(cat $s1) = tree1path4 && - test $(cat $s2) = tree2path4) -' - -test_expect_success '-- asubdir/path5: no stage 2 and 3 have stage 1' ' - test $(grep asubdir/path5 actual | cut "-d " -f2) = asubdir/path5 && - grep asubdir/path5 actual | cut "-d " -f1 | (read s1 s2 s3 && - test -f $s1 && - test $s2 = . && - test $s3 = . && - test $(cat $s1) = tree1asubdir/path5) -' - -test_expect_success 'checkout --temp within subdir' ' - ( - cd asubdir && - git checkout-index -a --stage=all >actual && - test_line_count = 1 actual && - test $(grep path5 actual | cut "-d " -f2) = path5 && - grep path5 actual | cut "-d " -f1 | (read s1 s2 s3 && - test -f ../$s1 && - test $s2 = . && - test $s3 = . && - test $(cat ../$s1) = tree1asubdir/path5) - ) -' - -test_expect_success 'checkout --temp symlink' ' - rm -f path* .merge_* actual .git/index && - test_ln_s_add path7 path6 && - git checkout-index --temp -a >actual && - test_line_count = 1 actual && - test $(cut "-d " -f2 actual) = path6 && - p=$(cut "-d " -f1 actual) && - test -f $p && - test $(cat $p) = path7 -' - -test_expect_success 'emit well-formed relative path' ' - rm -f path* .merge_* actual .git/index && - >path0123456789 && - git update-index --add path0123456789 && - ( - cd asubdir && - git checkout-index --temp -- ../path0123456789 >actual && - test_line_count = 1 actual && - test $(cut "-d " -f2 actual) = ../path0123456789 - ) -' - -test_done |