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/t3907-stash-show-config.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/t3907-stash-show-config.sh')
-rwxr-xr-x | third_party/git/t/t3907-stash-show-config.sh | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/third_party/git/t/t3907-stash-show-config.sh b/third_party/git/t/t3907-stash-show-config.sh deleted file mode 100755 index 10914bba7b37..000000000000 --- a/third_party/git/t/t3907-stash-show-config.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -test_description='Test git stash show configuration.' - -. ./test-lib.sh - -test_expect_success 'setup' ' - test_commit file -' - -# takes three parameters: -# 1. the stash.showStat value (or "<unset>") -# 2. the stash.showPatch value (or "<unset>") -# 3. the diff options of the expected output (or nothing for no output) -test_stat_and_patch () { - if test "<unset>" = "$1" - then - test_unconfig stash.showStat - else - test_config stash.showStat "$1" - fi && - - if test "<unset>" = "$2" - then - test_unconfig stash.showPatch - else - test_config stash.showPatch "$2" - fi && - - shift 2 && - echo 2 >file.t && - if test $# != 0 - then - git diff "$@" >expect - fi && - git stash && - git stash show >actual && - - if test $# = 0 - then - test_must_be_empty actual - else - test_cmp expect actual - fi -} - -test_expect_success 'showStat unset showPatch unset' ' - test_stat_and_patch "<unset>" "<unset>" --stat -' - -test_expect_success 'showStat unset showPatch false' ' - test_stat_and_patch "<unset>" false --stat -' - -test_expect_success 'showStat unset showPatch true' ' - test_stat_and_patch "<unset>" true --stat -p -' - -test_expect_success 'showStat false showPatch unset' ' - test_stat_and_patch false "<unset>" -' - -test_expect_success 'showStat false showPatch false' ' - test_stat_and_patch false false -' - -test_expect_success 'showStat false showPatch true' ' - test_stat_and_patch false true -p -' - -test_expect_success 'showStat true showPatch unset' ' - test_stat_and_patch true "<unset>" --stat -' - -test_expect_success 'showStat true showPatch false' ' - test_stat_and_patch true false --stat -' - -test_expect_success 'showStat true showPatch true' ' - test_stat_and_patch true true --stat -p -' - -test_done |