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/t7103-reset-bare.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/t7103-reset-bare.sh')
-rwxr-xr-x | third_party/git/t/t7103-reset-bare.sh | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/third_party/git/t/t7103-reset-bare.sh b/third_party/git/t/t7103-reset-bare.sh deleted file mode 100755 index afe36a533c4b..000000000000 --- a/third_party/git/t/t7103-reset-bare.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh - -test_description='git reset in a bare repository' -. ./test-lib.sh - -test_expect_success 'setup non-bare' ' - echo one >file && - git add file && - git commit -m one && - echo two >file && - git commit -a -m two -' - -test_expect_success '"hard" reset requires a worktree' ' - (cd .git && - test_must_fail git reset --hard) -' - -test_expect_success '"merge" reset requires a worktree' ' - (cd .git && - test_must_fail git reset --merge) -' - -test_expect_success '"keep" reset requires a worktree' ' - (cd .git && - test_must_fail git reset --keep) -' - -test_expect_success '"mixed" reset is ok' ' - (cd .git && git reset) -' - -test_expect_success '"soft" reset is ok' ' - (cd .git && git reset --soft) -' - -test_expect_success 'hard reset works with GIT_WORK_TREE' ' - mkdir worktree && - GIT_WORK_TREE=$PWD/worktree GIT_DIR=$PWD/.git git reset --hard && - test_cmp file worktree/file -' - -test_expect_success 'setup bare' ' - git clone --bare . bare.git && - cd bare.git -' - -test_expect_success '"hard" reset is not allowed in bare' ' - test_must_fail git reset --hard HEAD^ -' - -test_expect_success '"merge" reset is not allowed in bare' ' - test_must_fail git reset --merge HEAD^ -' - -test_expect_success '"keep" reset is not allowed in bare' ' - test_must_fail git reset --keep HEAD^ -' - -test_expect_success '"mixed" reset is not allowed in bare' ' - test_must_fail git reset --mixed HEAD^ -' - -test_expect_success '"soft" reset is allowed in bare' ' - git reset --soft HEAD^ && - test "$(git show --pretty=format:%s | head -n 1)" = "one" -' - -test_done |