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/t9124-git-svn-dcommit-auto-props.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/t9124-git-svn-dcommit-auto-props.sh')
-rwxr-xr-x | third_party/git/t/t9124-git-svn-dcommit-auto-props.sh | 105 |
1 files changed, 0 insertions, 105 deletions
diff --git a/third_party/git/t/t9124-git-svn-dcommit-auto-props.sh b/third_party/git/t/t9124-git-svn-dcommit-auto-props.sh deleted file mode 100755 index 9f7231d5b7da..000000000000 --- a/third_party/git/t/t9124-git-svn-dcommit-auto-props.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2008 Brad King - -test_description='git svn dcommit honors auto-props' - -. ./lib-git-svn.sh - -generate_auto_props() { -cat << EOF -[miscellany] -enable-auto-props=$1 -[auto-props] -*.sh = svn:mime-type=application/x-shellscript; svn:eol-style=LF -*.txt = svn:mime-type=text/plain; svn:eol-style = native -EOF -} - -test_expect_success 'initialize git svn' ' - mkdir import && - ( - cd import && - echo foo >foo && - svn_cmd import -m "import for git svn" . "$svnrepo" - ) && - rm -rf import && - git svn init "$svnrepo" && - git svn fetch -' - -test_expect_success 'enable auto-props config' ' - mkdir user && - generate_auto_props yes >user/config -' - -test_expect_success 'add files matching auto-props' ' - write_script exec1.sh </dev/null && - echo "hello" >hello.txt && - echo bar >bar && - git add exec1.sh hello.txt bar && - git commit -m "files for enabled auto-props" && - git svn dcommit --config-dir=user -' - -test_expect_success 'disable auto-props config' ' - generate_auto_props no >user/config -' - -test_expect_success 'add files matching disabled auto-props' ' - write_script exec2.sh </dev/null && - echo "world" >world.txt && - echo zot >zot && - git add exec2.sh world.txt zot && - git commit -m "files for disabled auto-props" && - git svn dcommit --config-dir=user -' - -test_expect_success 'check resulting svn repository' ' -( - mkdir work && - cd work && - svn_cmd co "$svnrepo" && - cd svnrepo && - - # Check properties from first commit. - if test_have_prereq POSIXPERM - then - test "x$(svn_cmd propget svn:executable exec1.sh)" = "x*" - fi && - test "x$(svn_cmd propget svn:mime-type exec1.sh)" = \ - "xapplication/x-shellscript" && - test "x$(svn_cmd propget svn:mime-type hello.txt)" = "xtext/plain" && - test "x$(svn_cmd propget svn:eol-style hello.txt)" = "xnative" && - test "x$(svn_cmd propget svn:mime-type bar)" = "x" && - - # Check properties from second commit. - if test_have_prereq POSIXPERM - then - test "x$(svn_cmd propget svn:executable exec2.sh)" = "x*" - fi && - test "x$(svn_cmd propget svn:mime-type exec2.sh)" = "x" && - test "x$(svn_cmd propget svn:mime-type world.txt)" = "x" && - test "x$(svn_cmd propget svn:eol-style world.txt)" = "x" && - test "x$(svn_cmd propget svn:mime-type zot)" = "x" -) -' - -test_expect_success 'check renamed file' ' - test -d user && - generate_auto_props yes > user/config && - git mv foo foo.sh && - git commit -m "foo => foo.sh" && - git svn dcommit --config-dir=user && - ( - cd work/svnrepo && - svn_cmd up && - test ! -e foo && - test -e foo.sh && - test "x$(svn_cmd propget svn:mime-type foo.sh)" = \ - "xapplication/x-shellscript" && - test "x$(svn_cmd propget svn:eol-style foo.sh)" = "xLF" - ) -' - -test_done |