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/t7521-ignored-mode.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/t7521-ignored-mode.sh')
-rwxr-xr-x | third_party/git/t/t7521-ignored-mode.sh | 233 |
1 files changed, 0 insertions, 233 deletions
diff --git a/third_party/git/t/t7521-ignored-mode.sh b/third_party/git/t/t7521-ignored-mode.sh deleted file mode 100755 index 91790943c3df..000000000000 --- a/third_party/git/t/t7521-ignored-mode.sh +++ /dev/null @@ -1,233 +0,0 @@ -#!/bin/sh - -test_description='git status ignored modes' - -. ./test-lib.sh - -test_expect_success 'setup initial commit and ignore file' ' - cat >.gitignore <<-\EOF && - *.ign - ignored_dir/ - !*.unignore - EOF - git add . && - git commit -m "Initial commit" -' - -test_expect_success 'Verify behavior of status on directories with ignored files' ' - test_when_finished "git clean -fdx" && - cat >expect <<-\EOF && - ? expect - ? output - ! dir/ignored/ignored_1.ign - ! dir/ignored/ignored_2.ign - ! ignored/ignored_1.ign - ! ignored/ignored_2.ign - EOF - - mkdir -p ignored dir/ignored && - touch ignored/ignored_1.ign ignored/ignored_2.ign \ - dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign && - - git status --porcelain=v2 --ignored=matching --untracked-files=all >output && - test_i18ncmp expect output -' - -test_expect_success 'Verify status behavior on directory with tracked & ignored files' ' - test_when_finished "git clean -fdx && git reset HEAD~1 --hard" && - cat >expect <<-\EOF && - ? expect - ? output - ! dir/tracked_ignored/ignored_1.ign - ! dir/tracked_ignored/ignored_2.ign - ! tracked_ignored/ignored_1.ign - ! tracked_ignored/ignored_2.ign - EOF - - mkdir -p tracked_ignored dir/tracked_ignored && - touch tracked_ignored/tracked_1 tracked_ignored/tracked_2 \ - tracked_ignored/ignored_1.ign tracked_ignored/ignored_2.ign \ - dir/tracked_ignored/tracked_1 dir/tracked_ignored/tracked_2 \ - dir/tracked_ignored/ignored_1.ign dir/tracked_ignored/ignored_2.ign && - - git add tracked_ignored/tracked_1 tracked_ignored/tracked_2 \ - dir/tracked_ignored/tracked_1 dir/tracked_ignored/tracked_2 && - git commit -m "commit tracked files" && - - git status --porcelain=v2 --ignored=matching --untracked-files=all >output && - test_i18ncmp expect output -' - -test_expect_success 'Verify status behavior on directory with untracked and ignored files' ' - test_when_finished "git clean -fdx" && - cat >expect <<-\EOF && - ? dir/untracked_ignored/untracked_1 - ? dir/untracked_ignored/untracked_2 - ? expect - ? output - ? untracked_ignored/untracked_1 - ? untracked_ignored/untracked_2 - ! dir/untracked_ignored/ignored_1.ign - ! dir/untracked_ignored/ignored_2.ign - ! untracked_ignored/ignored_1.ign - ! untracked_ignored/ignored_2.ign - EOF - - mkdir -p untracked_ignored dir/untracked_ignored && - touch untracked_ignored/untracked_1 untracked_ignored/untracked_2 \ - untracked_ignored/ignored_1.ign untracked_ignored/ignored_2.ign \ - dir/untracked_ignored/untracked_1 dir/untracked_ignored/untracked_2 \ - dir/untracked_ignored/ignored_1.ign dir/untracked_ignored/ignored_2.ign && - - git status --porcelain=v2 --ignored=matching --untracked-files=all >output && - test_i18ncmp expect output -' - -test_expect_success 'Verify status matching ignored files on ignored directory' ' - test_when_finished "git clean -fdx" && - cat >expect <<-\EOF && - ? expect - ? output - ! ignored_dir/ - EOF - - mkdir ignored_dir && - touch ignored_dir/ignored_1 ignored_dir/ignored_2 \ - ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign && - - git status --porcelain=v2 --ignored=matching --untracked-files=all >output && - test_i18ncmp expect output -' - -test_expect_success 'Verify status behavior on ignored directory containing tracked file' ' - test_when_finished "git clean -fdx && git reset HEAD~1 --hard" && - cat >expect <<-\EOF && - ? expect - ? output - ! ignored_dir/ignored_1 - ! ignored_dir/ignored_1.ign - ! ignored_dir/ignored_2 - ! ignored_dir/ignored_2.ign - EOF - - mkdir ignored_dir && - touch ignored_dir/ignored_1 ignored_dir/ignored_2 \ - ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign \ - ignored_dir/tracked && - git add -f ignored_dir/tracked && - git commit -m "Force add file in ignored directory" && - git status --porcelain=v2 --ignored=matching --untracked-files=all >output && - test_i18ncmp expect output -' - -test_expect_success 'Verify matching ignored files with --untracked-files=normal' ' - test_when_finished "git clean -fdx" && - cat >expect <<-\EOF && - ? expect - ? output - ? untracked_dir/ - ! ignored_dir/ - ! ignored_files/ignored_1.ign - ! ignored_files/ignored_2.ign - EOF - - mkdir ignored_dir ignored_files untracked_dir && - touch ignored_dir/ignored_1 ignored_dir/ignored_2 \ - ignored_files/ignored_1.ign ignored_files/ignored_2.ign \ - untracked_dir/untracked && - git status --porcelain=v2 --ignored=matching --untracked-files=normal >output && - test_i18ncmp expect output -' - -test_expect_success 'Verify matching ignored files with --untracked-files=normal' ' - test_when_finished "git clean -fdx" && - cat >expect <<-\EOF && - ? expect - ? output - ? untracked_dir/ - ! ignored_dir/ - ! ignored_files/ignored_1.ign - ! ignored_files/ignored_2.ign - EOF - - mkdir ignored_dir ignored_files untracked_dir && - touch ignored_dir/ignored_1 ignored_dir/ignored_2 \ - ignored_files/ignored_1.ign ignored_files/ignored_2.ign \ - untracked_dir/untracked && - git status --porcelain=v2 --ignored=matching --untracked-files=normal >output && - test_i18ncmp expect output -' - -test_expect_success 'Verify status behavior on ignored directory containing tracked file' ' - test_when_finished "git clean -fdx && git reset HEAD~1 --hard" && - cat >expect <<-\EOF && - ? expect - ? output - ! ignored_dir/ignored_1 - ! ignored_dir/ignored_1.ign - ! ignored_dir/ignored_2 - ! ignored_dir/ignored_2.ign - EOF - - mkdir ignored_dir && - touch ignored_dir/ignored_1 ignored_dir/ignored_2 \ - ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign \ - ignored_dir/tracked && - git add -f ignored_dir/tracked && - git commit -m "Force add file in ignored directory" && - git status --porcelain=v2 --ignored=matching --untracked-files=normal >output && - test_i18ncmp expect output -' - -test_expect_success 'Verify behavior of status with --ignored=no' ' - test_when_finished "git clean -fdx" && - cat >expect <<-\EOF && - ? expect - ? output - EOF - - mkdir -p ignored dir/ignored && - touch ignored/ignored_1.ign ignored/ignored_2.ign \ - dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign && - - git status --porcelain=v2 --ignored=no --untracked-files=all >output && - test_i18ncmp expect output -' - -test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=all' ' - test_when_finished "git clean -fdx" && - cat >expect <<-\EOF && - ? expect - ? output - ! dir/ignored/ignored_1.ign - ! dir/ignored/ignored_2.ign - ! ignored/ignored_1.ign - ! ignored/ignored_2.ign - EOF - - mkdir -p ignored dir/ignored && - touch ignored/ignored_1.ign ignored/ignored_2.ign \ - dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign && - - git status --porcelain=v2 --ignored=traditional --untracked-files=all >output && - test_i18ncmp expect output -' - -test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=normal' ' - test_when_finished "git clean -fdx" && - cat >expect <<-\EOF && - ? expect - ? output - ! dir/ - ! ignored/ - EOF - - mkdir -p ignored dir/ignored && - touch ignored/ignored_1.ign ignored/ignored_2.ign \ - dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign && - - git status --porcelain=v2 --ignored=traditional --untracked-files=normal >output && - test_i18ncmp expect output -' - -test_done |