diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t3601-rm-pathspec-file.sh | |
parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t3601-rm-pathspec-file.sh')
-rwxr-xr-x | third_party/git/t/t3601-rm-pathspec-file.sh | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/third_party/git/t/t3601-rm-pathspec-file.sh b/third_party/git/t/t3601-rm-pathspec-file.sh deleted file mode 100755 index 7de21f8bcff1..000000000000 --- a/third_party/git/t/t3601-rm-pathspec-file.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh - -test_description='rm --pathspec-from-file' - -. ./test-lib.sh - -test_tick - -test_expect_success setup ' - echo A >fileA.t && - echo B >fileB.t && - echo C >fileC.t && - echo D >fileD.t && - git add fileA.t fileB.t fileC.t fileD.t && - git commit -m "files" && - - git tag checkpoint -' - -restore_checkpoint () { - git reset --hard checkpoint -} - -verify_expect () { - git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual && - test_cmp expect actual -} - -test_expect_success 'simplest' ' - restore_checkpoint && - - cat >expect <<-\EOF && - D fileA.t - EOF - - echo fileA.t | git rm --pathspec-from-file=- && - verify_expect -' - -test_expect_success '--pathspec-file-nul' ' - restore_checkpoint && - - cat >expect <<-\EOF && - D fileA.t - D fileB.t - EOF - - printf "fileA.t\0fileB.t\0" | git rm --pathspec-from-file=- --pathspec-file-nul && - verify_expect -' - -test_expect_success 'only touches what was listed' ' - restore_checkpoint && - - cat >expect <<-\EOF && - D fileB.t - D fileC.t - EOF - - printf "fileB.t\nfileC.t\n" | git rm --pathspec-from-file=- && - verify_expect -' - -test_expect_success 'error conditions' ' - restore_checkpoint && - echo fileA.t >list && - - test_must_fail git rm --pathspec-from-file=list -- fileA.t 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err && - - test_must_fail git rm --pathspec-file-nul 2>err && - test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err && - - >empty_list && - test_must_fail git rm --pathspec-from-file=empty_list 2>err && - test_i18ngrep -e "No pathspec was given. Which files should I remove?" err -' - -test_done |