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/t7403-submodule-sync.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/t7403-submodule-sync.sh')
-rwxr-xr-x | third_party/git/t/t7403-submodule-sync.sh | 350 |
1 files changed, 0 insertions, 350 deletions
diff --git a/third_party/git/t/t7403-submodule-sync.sh b/third_party/git/t/t7403-submodule-sync.sh deleted file mode 100755 index 0726799e74e7..000000000000 --- a/third_party/git/t/t7403-submodule-sync.sh +++ /dev/null @@ -1,350 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2008 David Aguilar -# - -test_description='git submodule sync - -These tests exercise the "git submodule sync" subcommand. -' - -. ./test-lib.sh - -test_expect_success setup ' - echo file >file && - git add file && - test_tick && - git commit -m upstream && - git clone . super && - git clone super submodule && - ( - cd submodule && - git submodule add ../submodule sub-submodule && - test_tick && - git commit -m "sub-submodule" - ) && - ( - cd super && - git submodule add ../submodule submodule && - test_tick && - git commit -m "submodule" - ) && - git clone super super-clone && - ( - cd super-clone && - git submodule update --init --recursive - ) && - git clone super empty-clone && - ( - cd empty-clone && - git submodule init - ) && - git clone super top-only-clone && - git clone super relative-clone && - ( - cd relative-clone && - git submodule update --init --recursive - ) && - git clone super recursive-clone && - ( - cd recursive-clone && - git submodule update --init --recursive - ) -' - -test_expect_success 'change submodule' ' - ( - cd submodule && - echo second line >>file && - test_tick && - git commit -a -m "change submodule" - ) -' - -reset_submodule_urls () { - ( - root=$(pwd) && - cd super-clone/submodule && - git config remote.origin.url "$root/submodule" - ) && - ( - root=$(pwd) && - cd super-clone/submodule/sub-submodule && - git config remote.origin.url "$root/submodule" - ) -} - -test_expect_success 'change submodule url' ' - ( - cd super && - cd submodule && - git checkout master && - git pull - ) && - mv submodule moved-submodule && - ( - cd moved-submodule && - git config -f .gitmodules submodule.sub-submodule.url ../moved-submodule && - test_tick && - git commit -a -m moved-sub-submodule - ) && - ( - cd super && - git config -f .gitmodules submodule.submodule.url ../moved-submodule && - test_tick && - git commit -a -m moved-submodule - ) -' - -test_expect_success '"git submodule sync" should update submodule URLs' ' - ( - cd super-clone && - git pull --no-recurse-submodules && - git submodule sync - ) && - test -d "$( - cd super-clone/submodule && - git config remote.origin.url - )" && - test ! -d "$( - cd super-clone/submodule/sub-submodule && - git config remote.origin.url - )" && - ( - cd super-clone/submodule && - git checkout master && - git pull - ) && - ( - cd super-clone && - test -d "$(git config submodule.submodule.url)" - ) -' - -test_expect_success '"git submodule sync --recursive" should update all submodule URLs' ' - ( - cd super-clone && - ( - cd submodule && - git pull --no-recurse-submodules - ) && - git submodule sync --recursive - ) && - test -d "$( - cd super-clone/submodule && - git config remote.origin.url - )" && - test -d "$( - cd super-clone/submodule/sub-submodule && - git config remote.origin.url - )" && - ( - cd super-clone/submodule/sub-submodule && - git checkout master && - git pull - ) -' - -test_expect_success 'reset submodule URLs' ' - reset_submodule_urls super-clone -' - -test_expect_success '"git submodule sync" should update submodule URLs - subdirectory' ' - ( - cd super-clone && - git pull --no-recurse-submodules && - mkdir -p sub && - cd sub && - git submodule sync >../../output - ) && - test_i18ngrep "\\.\\./submodule" output && - test -d "$( - cd super-clone/submodule && - git config remote.origin.url - )" && - test ! -d "$( - cd super-clone/submodule/sub-submodule && - git config remote.origin.url - )" && - ( - cd super-clone/submodule && - git checkout master && - git pull - ) && - ( - cd super-clone && - test -d "$(git config submodule.submodule.url)" - ) -' - -test_expect_success '"git submodule sync --recursive" should update all submodule URLs - subdirectory' ' - ( - cd super-clone && - ( - cd submodule && - git pull --no-recurse-submodules - ) && - mkdir -p sub && - cd sub && - git submodule sync --recursive >../../output - ) && - test_i18ngrep "\\.\\./submodule/sub-submodule" output && - test -d "$( - cd super-clone/submodule && - git config remote.origin.url - )" && - test -d "$( - cd super-clone/submodule/sub-submodule && - git config remote.origin.url - )" && - ( - cd super-clone/submodule/sub-submodule && - git checkout master && - git pull - ) -' - -test_expect_success '"git submodule sync" should update known submodule URLs' ' - ( - cd empty-clone && - git pull && - git submodule sync && - test -d "$(git config submodule.submodule.url)" - ) -' - -test_expect_success '"git submodule sync" should not vivify uninteresting submodule' ' - ( - cd top-only-clone && - git pull && - git submodule sync && - test -z "$(git config submodule.submodule.url)" && - git submodule sync submodule && - test -z "$(git config submodule.submodule.url)" - ) -' - -test_expect_success '"git submodule sync" handles origin URL of the form foo' ' - ( - cd relative-clone && - git remote set-url origin foo && - git submodule sync && - ( - cd submodule && - #actual fails with: "cannot strip off url foo - test "$(git config remote.origin.url)" = "../submodule" - ) - ) -' - -test_expect_success '"git submodule sync" handles origin URL of the form foo/bar' ' - ( - cd relative-clone && - git remote set-url origin foo/bar && - git submodule sync && - ( - cd submodule && - #actual foo/submodule - test "$(git config remote.origin.url)" = "../foo/submodule" - ) && - ( - cd submodule/sub-submodule && - test "$(git config remote.origin.url)" != "../../foo/submodule" - ) - ) -' - -test_expect_success '"git submodule sync --recursive" propagates changes in origin' ' - ( - cd recursive-clone && - git remote set-url origin foo/bar && - git submodule sync --recursive && - ( - cd submodule && - #actual foo/submodule - test "$(git config remote.origin.url)" = "../foo/submodule" - ) && - ( - cd submodule/sub-submodule && - test "$(git config remote.origin.url)" = "../../foo/submodule" - ) - ) -' - -test_expect_success '"git submodule sync" handles origin URL of the form ./foo' ' - ( - cd relative-clone && - git remote set-url origin ./foo && - git submodule sync && - ( - cd submodule && - #actual ./submodule - test "$(git config remote.origin.url)" = "../submodule" - ) - ) -' - -test_expect_success '"git submodule sync" handles origin URL of the form ./foo/bar' ' - ( - cd relative-clone && - git remote set-url origin ./foo/bar && - git submodule sync && - ( - cd submodule && - #actual ./foo/submodule - test "$(git config remote.origin.url)" = "../foo/submodule" - ) - ) -' - -test_expect_success '"git submodule sync" handles origin URL of the form ../foo' ' - ( - cd relative-clone && - git remote set-url origin ../foo && - git submodule sync && - ( - cd submodule && - #actual ../submodule - test "$(git config remote.origin.url)" = "../../submodule" - ) - ) -' - -test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar' ' - ( - cd relative-clone && - git remote set-url origin ../foo/bar && - git submodule sync && - ( - cd submodule && - #actual ../foo/submodule - test "$(git config remote.origin.url)" = "../../foo/submodule" - ) - ) -' - -test_expect_success '"git submodule sync" handles origin URL of the form ../foo/bar with deeply nested submodule' ' - ( - cd relative-clone && - git remote set-url origin ../foo/bar && - mkdir -p a/b/c && - ( - cd a/b/c && - git init && - >.gitignore && - git add .gitignore && - test_tick && - git commit -m "initial commit" - ) && - git submodule add ../bar/a/b/c ./a/b/c && - git submodule sync && - ( - cd a/b/c && - #actual ../foo/bar/a/b/c - test "$(git config remote.origin.url)" = "../../../../foo/bar/a/b/c" - ) - ) -' - - -test_done |