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/t9148-git-svn-propset.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/t9148-git-svn-propset.sh')
-rwxr-xr-x | third_party/git/t/t9148-git-svn-propset.sh | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/third_party/git/t/t9148-git-svn-propset.sh b/third_party/git/t/t9148-git-svn-propset.sh deleted file mode 100755 index 102639090c11..000000000000 --- a/third_party/git/t/t9148-git-svn-propset.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2014 Alfred Perlstein -# - -test_description='git svn propset tests' - -. ./lib-git-svn.sh - -foo_subdir2="subdir/subdir2/foo_subdir2" - -set -e -mkdir import && -(set -e ; cd import - mkdir subdir - mkdir subdir/subdir2 - touch foo # for 'add props top level' - touch subdir/foo_subdir # for 'add props relative' - touch "$foo_subdir2" # for 'add props subdir' - svn_cmd import -m 'import for git svn' . "$svnrepo" >/dev/null -) -rm -rf import - -test_expect_success 'initialize git svn' ' - git svn init "$svnrepo" - ' - -test_expect_success 'fetch revisions from svn' ' - git svn fetch - ' - -set_props () { - subdir="$1" - file="$2" - shift;shift; - (cd "$subdir" && - while [ $# -gt 0 ] ; do - git svn propset "$1" "$2" "$file" || exit 1 - shift;shift; - done && - echo hello >> "$file" && - git commit -m "testing propset" "$file") -} - -confirm_props () { - subdir="$1" - file="$2" - shift;shift; - (set -e ; cd "svn_project/$subdir" && - while [ $# -gt 0 ] ; do - test "$(svn_cmd propget "$1" "$file")" = "$2" || exit 1 - shift;shift; - done) -} - - -#The current implementation has a restriction: -#svn propset will be taken as a delta for svn dcommit only -#if the file content is also modified -test_expect_success 'add props top level' ' - set_props "." "foo" "svn:keywords" "FreeBSD=%H" && - git svn dcommit && - svn_cmd co "$svnrepo" svn_project && - confirm_props "." "foo" "svn:keywords" "FreeBSD=%H" && - rm -rf svn_project - ' - -test_expect_success 'add multiple props' ' - set_props "." "foo" \ - "svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes && - git svn dcommit && - svn_cmd co "$svnrepo" svn_project && - confirm_props "." "foo" \ - "svn:keywords" "FreeBSD=%H" fbsd:nokeywords yes && - rm -rf svn_project - ' - -test_expect_success 'add props subdir' ' - set_props "." "$foo_subdir2" svn:keywords "FreeBSD=%H" && - git svn dcommit && - svn_cmd co "$svnrepo" svn_project && - confirm_props "." "$foo_subdir2" "svn:keywords" "FreeBSD=%H" && - rm -rf svn_project - ' - -test_expect_success 'add props relative' ' - set_props "subdir/subdir2" "../foo_subdir" \ - svn:keywords "FreeBSD=%H" && - git svn dcommit && - svn_cmd co "$svnrepo" svn_project && - confirm_props "subdir/subdir2" "../foo_subdir" \ - svn:keywords "FreeBSD=%H" && - rm -rf svn_project - ' -test_done |