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/t2101-update-index-reupdate.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/t2101-update-index-reupdate.sh')
-rwxr-xr-x | third_party/git/t/t2101-update-index-reupdate.sh | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/third_party/git/t/t2101-update-index-reupdate.sh b/third_party/git/t/t2101-update-index-reupdate.sh deleted file mode 100755 index 6c32d42c8c68..000000000000 --- a/third_party/git/t/t2101-update-index-reupdate.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006 Junio C Hamano -# - -test_description='git update-index --again test. -' - -. ./test-lib.sh - -test_expect_success 'update-index --add' ' - echo hello world >file1 && - echo goodbye people >file2 && - git update-index --add file1 file2 && - git ls-files -s >current && - cat >expected <<-EOF && - 100644 $(git hash-object file1) 0 file1 - 100644 $(git hash-object file2) 0 file2 - EOF - cmp current expected -' - -test_expect_success 'update-index --again' ' - rm -f file1 && - echo hello everybody >file2 && - if git update-index --again - then - echo should have refused to remove file1 - exit 1 - else - echo happy - failed as expected - fi && - git ls-files -s >current && - cmp current expected -' - -test_expect_success 'update-index --remove --again' ' - git update-index --remove --again && - git ls-files -s >current && - cat >expected <<-EOF && - 100644 $(git hash-object file2) 0 file2 - EOF - cmp current expected -' - -test_expect_success 'first commit' 'git commit -m initial' - -test_expect_success 'update-index again' ' - mkdir -p dir1 && - echo hello world >dir1/file3 && - echo goodbye people >file2 && - git update-index --add file2 dir1/file3 && - echo hello everybody >file2 && - echo happy >dir1/file3 && - git update-index --again && - git ls-files -s >current && - cat >expected <<-EOF && - 100644 $(git hash-object dir1/file3) 0 dir1/file3 - 100644 $(git hash-object file2) 0 file2 - EOF - cmp current expected -' - -file2=$(git hash-object file2) -test_expect_success 'update-index --update from subdir' ' - echo not so happy >file2 && - (cd dir1 && - cat ../file2 >file3 && - git update-index --again - ) && - git ls-files -s >current && - cat >expected <<-EOF && - 100644 $(git hash-object dir1/file3) 0 dir1/file3 - 100644 $file2 0 file2 - EOF - test_cmp expected current -' - -test_expect_success 'update-index --update with pathspec' ' - echo very happy >file2 && - cat file2 >dir1/file3 && - git update-index --again dir1/ && - git ls-files -s >current && - cat >expected <<-EOF && - 100644 $(git hash-object dir1/file3) 0 dir1/file3 - 100644 $file2 0 file2 - EOF - cmp current expected -' - -test_done |