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/t3909-stash-pathspec-file.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/t3909-stash-pathspec-file.sh')
-rwxr-xr-x | third_party/git/t/t3909-stash-pathspec-file.sh | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/third_party/git/t/t3909-stash-pathspec-file.sh b/third_party/git/t/t3909-stash-pathspec-file.sh deleted file mode 100755 index 55e050cfd4db..000000000000 --- a/third_party/git/t/t3909-stash-pathspec-file.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -test_description='stash --pathspec-from-file' - -. ./test-lib.sh - -test_tick - -test_expect_success setup ' - >fileA.t && - >fileB.t && - >fileC.t && - >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 stash show --name-status >actual && - test_cmp expect actual -} - -test_expect_success 'simplest' ' - restore_checkpoint && - - # More files are written to make sure that git didnt ignore - # --pathspec-from-file, stashing everything - echo A >fileA.t && - echo B >fileB.t && - echo C >fileC.t && - echo D >fileD.t && - - cat >expect <<-\EOF && - M fileA.t - EOF - - echo fileA.t | git stash push --pathspec-from-file=- && - verify_expect -' - -test_expect_success '--pathspec-file-nul' ' - restore_checkpoint && - - # More files are written to make sure that git didnt ignore - # --pathspec-from-file, stashing everything - echo A >fileA.t && - echo B >fileB.t && - echo C >fileC.t && - echo D >fileD.t && - - cat >expect <<-\EOF && - M fileA.t - M fileB.t - EOF - - printf "fileA.t\0fileB.t\0" | git stash push --pathspec-from-file=- --pathspec-file-nul && - verify_expect -' - -test_expect_success 'only touches what was listed' ' - restore_checkpoint && - - # More files are written to make sure that git didnt ignore - # --pathspec-from-file, stashing everything - echo A >fileA.t && - echo B >fileB.t && - echo C >fileC.t && - echo D >fileD.t && - - cat >expect <<-\EOF && - M fileB.t - M fileC.t - EOF - - printf "fileB.t\nfileC.t\n" | git stash push --pathspec-from-file=- && - verify_expect -' - -test_expect_success 'error conditions' ' - restore_checkpoint && - echo A >fileA.t && - echo fileA.t >list && - - test_must_fail git stash push --pathspec-from-file=list --patch 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" err && - - test_must_fail git stash push --pathspec-from-file=list -- fileA.t 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err && - - test_must_fail git stash push --pathspec-file-nul 2>err && - test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err -' - -test_done |