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/t7409-submodule-detached-work-tree.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/t7409-submodule-detached-work-tree.sh')
| -rwxr-xr-x | third_party/git/t/t7409-submodule-detached-work-tree.sh | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/third_party/git/t/t7409-submodule-detached-work-tree.sh b/third_party/git/t/t7409-submodule-detached-work-tree.sh deleted file mode 100755 index fc018e3638a8..000000000000 --- a/third_party/git/t/t7409-submodule-detached-work-tree.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2012 Daniel Graña -# - -test_description='Test submodules on detached working tree - -This test verifies that "git submodule" initialization, update and addition works -on detached working trees -' - -TEST_NO_CREATE_REPO=1 -. ./test-lib.sh - -test_expect_success 'submodule on detached working tree' ' - git init --bare remote && - test_create_repo bundle1 && - ( - cd bundle1 && - test_commit "shoot" && - git rev-parse --verify HEAD >../expect - ) && - mkdir home && - ( - cd home && - GIT_WORK_TREE="$(pwd)" && - GIT_DIR="$(pwd)/.dotfiles" && - export GIT_WORK_TREE GIT_DIR && - git clone --bare ../remote .dotfiles && - git submodule add ../bundle1 .vim/bundle/sogood && - test_commit "sogood" && - ( - unset GIT_WORK_TREE GIT_DIR && - cd .vim/bundle/sogood && - git rev-parse --verify HEAD >actual && - test_cmp ../../../../expect actual - ) && - git push origin master - ) && - mkdir home2 && - ( - cd home2 && - git clone --bare ../remote .dotfiles && - GIT_WORK_TREE="$(pwd)" && - GIT_DIR="$(pwd)/.dotfiles" && - export GIT_WORK_TREE GIT_DIR && - git checkout master && - git submodule update --init && - ( - unset GIT_WORK_TREE GIT_DIR && - cd .vim/bundle/sogood && - git rev-parse --verify HEAD >actual && - test_cmp ../../../../expect actual - ) - ) -' - -test_expect_success 'submodule on detached working pointed by core.worktree' ' - mkdir home3 && - ( - cd home3 && - GIT_DIR="$(pwd)/.dotfiles" && - export GIT_DIR && - git clone --bare ../remote "$GIT_DIR" && - git config core.bare false && - git config core.worktree .. && - git checkout master && - git submodule add ../bundle1 .vim/bundle/dupe && - test_commit "dupe" && - git push origin master - ) && - ( - cd home && - GIT_DIR="$(pwd)/.dotfiles" && - export GIT_DIR && - git config core.bare false && - git config core.worktree .. && - git pull && - git submodule update --init && - test -f .vim/bundle/dupe/shoot.t - ) -' - -test_done |