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/t9166-git-svn-fetch-merge-branch-of-branch2.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/t9166-git-svn-fetch-merge-branch-of-branch2.sh')
-rwxr-xr-x | third_party/git/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/third_party/git/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh b/third_party/git/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh deleted file mode 100755 index 52f2e46a5b4d..000000000000 --- a/third_party/git/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2012 Steven Walter -# - -test_description='git svn merge detection' -. ./lib-git-svn.sh - -svn_ver="$(svn --version --quiet)" -case $svn_ver in -0.* | 1.[0-4].*) - skip_all="skipping git-svn test - SVN too old ($svn_ver)" - test_done - ;; -esac - -test_expect_success 'initialize source svn repo' ' - svn_cmd mkdir -m x "$svnrepo"/trunk && - svn_cmd mkdir -m x "$svnrepo"/branches && - svn_cmd co "$svnrepo"/trunk "$SVN_TREE" && - ( - cd "$SVN_TREE" && - touch foo && - svn_cmd add foo && - svn_cmd commit -m "initial commit" && - svn_cmd cp -m branch "$svnrepo"/trunk "$svnrepo"/branches/branch1 && - svn_cmd switch "$svnrepo"/branches/branch1 && - touch bar && - svn_cmd add bar && - svn_cmd commit -m branch1 && - svn_cmd cp -m branch "$svnrepo"/branches/branch1 "$svnrepo"/branches/branch2 && - svn_cmd switch "$svnrepo"/branches/branch2 && - touch baz && - svn_cmd add baz && - svn_cmd commit -m branch2 && - svn_cmd switch "$svnrepo"/trunk && - svn_cmd merge --reintegrate "$svnrepo"/branches/branch2 && - svn_cmd commit -m "merge branch2" - ) && - rm -rf "$SVN_TREE" -' - -test_expect_success 'clone svn repo' ' - git svn init -s "$svnrepo" && - git svn fetch -' - -test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2) && - y=$(git rev-parse origin/branch2) && - test "x$x" = "x$y" -' - -test_done |