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/t9133-git-svn-nested-git-repo.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/t9133-git-svn-nested-git-repo.sh')
| -rwxr-xr-x | third_party/git/t/t9133-git-svn-nested-git-repo.sh | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/third_party/git/t/t9133-git-svn-nested-git-repo.sh b/third_party/git/t/t9133-git-svn-nested-git-repo.sh deleted file mode 100755 index f894860867a1..000000000000 --- a/third_party/git/t/t9133-git-svn-nested-git-repo.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2009 Eric Wong -# - -test_description='git svn property tests' -. ./lib-git-svn.sh - -test_expect_success 'setup repo with a git repo inside it' ' - svn_cmd co "$svnrepo" s && - ( - cd s && - git init && - test -f .git/HEAD && - > .git/a && - echo a > a && - svn_cmd add .git a && - svn_cmd commit -m "create a nested git repo" && - svn_cmd up && - echo hi >> .git/a && - svn_cmd commit -m "modify .git/a" && - svn_cmd up - ) -' - -test_expect_success 'clone an SVN repo containing a git repo' ' - git svn clone "$svnrepo" g && - echo a > expect && - test_cmp expect g/a -' - -test_expect_success 'SVN-side change outside of .git' ' - ( - cd s && - echo b >> a && - svn_cmd commit -m "SVN-side change outside of .git" && - svn_cmd up && - svn_cmd log -v | fgrep "SVN-side change outside of .git" - ) -' - -test_expect_success 'update git svn-cloned repo' ' - ( - cd g && - git svn rebase && - echo a > expect && - echo b >> expect && - test_cmp expect a && - rm expect - ) -' - -test_expect_success 'SVN-side change inside of .git' ' - ( - cd s && - git add a && - git commit -m "add a inside an SVN repo" && - git log && - svn_cmd add --force .git && - svn_cmd commit -m "SVN-side change inside of .git" && - svn_cmd up && - svn_cmd log -v | fgrep "SVN-side change inside of .git" - ) -' - -test_expect_success 'update git svn-cloned repo' ' - ( - cd g && - git svn rebase && - echo a > expect && - echo b >> expect && - test_cmp expect a && - rm expect - ) -' - -test_expect_success 'SVN-side change in and out of .git' ' - ( - cd s && - echo c >> a && - git add a && - git commit -m "add a inside an SVN repo" && - svn_cmd commit -m "SVN-side change in and out of .git" && - svn_cmd up && - svn_cmd log -v | fgrep "SVN-side change in and out of .git" - ) -' - -test_expect_success 'update git svn-cloned repo again' ' - ( - cd g && - git svn rebase && - echo a > expect && - echo b >> expect && - echo c >> expect && - test_cmp expect a && - rm expect - ) -' - -test_done |