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/t9140-git-svn-reset.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/t9140-git-svn-reset.sh')
-rwxr-xr-x | third_party/git/t/t9140-git-svn-reset.sh | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/third_party/git/t/t9140-git-svn-reset.sh b/third_party/git/t/t9140-git-svn-reset.sh deleted file mode 100755 index e8559046296c..000000000000 --- a/third_party/git/t/t9140-git-svn-reset.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2009 Ben Jackson -# - -test_description='git svn reset' -. ./lib-git-svn.sh - -test_expect_success 'setup test repository' ' - svn_cmd co "$svnrepo" s && - ( - cd s && - mkdir vis && - echo always visible > vis/vis.txt && - svn_cmd add vis && - svn_cmd commit -m "create visible files" && - mkdir hid && - echo initially hidden > hid/hid.txt && - svn_cmd add hid && - svn_cmd commit -m "create initially hidden files" && - svn_cmd up && - echo mod >> vis/vis.txt && - svn_cmd commit -m "modify vis" && - svn_cmd up - ) -' - -test_expect_success 'clone SVN repository with hidden directory' ' - git svn init "$svnrepo" g && - ( cd g && git svn fetch --ignore-paths="^hid" ) -' - -test_expect_success 'modify hidden file in SVN repo' ' - ( cd s && - echo mod hidden >> hid/hid.txt && - svn_cmd commit -m "modify hid" && - svn_cmd up - ) -' - -test_expect_success 'fetch fails on modified hidden file' ' - ( cd g && - git svn find-rev refs/remotes/git-svn > ../expect && - test_must_fail git svn fetch 2> ../errors && - git svn find-rev refs/remotes/git-svn > ../expect2 ) && - fgrep "not found in commit" errors && - test_cmp expect expect2 -' - -test_expect_success 'reset unwinds back to r1' ' - ( cd g && - git svn reset -r1 && - git svn find-rev refs/remotes/git-svn > ../expect2 ) && - echo 1 >expect && - test_cmp expect expect2 -' - -test_expect_success 'refetch succeeds not ignoring any files' ' - ( cd g && - git svn fetch && - git svn rebase && - fgrep "mod hidden" hid/hid.txt - ) -' - -test_done |