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/t9118-git-svn-funky-branch-names.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/t9118-git-svn-funky-branch-names.sh')
-rwxr-xr-x | third_party/git/t/t9118-git-svn-funky-branch-names.sh | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/third_party/git/t/t9118-git-svn-funky-branch-names.sh b/third_party/git/t/t9118-git-svn-funky-branch-names.sh deleted file mode 100755 index a159ff96b718..000000000000 --- a/third_party/git/t/t9118-git-svn-funky-branch-names.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2007 Eric Wong -# - -test_description='git svn funky branch names' -. ./lib-git-svn.sh - -# Abo-Uebernahme (Bug #994) -scary_uri='Abo-Uebernahme%20%28Bug%20%23994%29' -scary_ref='Abo-Uebernahme%20(Bug%20#994)' - -test_expect_success 'setup svnrepo' ' - mkdir project project/trunk project/branches project/tags && - echo foo > project/trunk/foo && - svn_cmd import -m "$test_description" project "$svnrepo/pr ject" && - rm -rf project && - svn_cmd cp -m "fun" "$svnrepo/pr ject/trunk" \ - "$svnrepo/pr ject/branches/fun plugin" && - svn_cmd cp -m "more fun!" "$svnrepo/pr ject/branches/fun plugin" \ - "$svnrepo/pr ject/branches/more fun plugin!" && - svn_cmd cp -m "scary" "$svnrepo/pr ject/branches/fun plugin" \ - "$svnrepo/pr ject/branches/$scary_uri" && - svn_cmd cp -m "leading dot" "$svnrepo/pr ject/trunk" \ - "$svnrepo/pr ject/branches/.leading_dot" && - if test_have_prereq !MINGW - then - svn_cmd cp -m "trailing dot" "$svnrepo/pr ject/trunk" \ - "$svnrepo/pr ject/branches/trailing_dot." - fi && - svn_cmd cp -m "trailing .lock" "$svnrepo/pr ject/trunk" \ - "$svnrepo/pr ject/branches/trailing_dotlock.lock" && - svn_cmd cp -m "reflog" "$svnrepo/pr ject/trunk" \ - "$svnrepo/pr ject/branches/not-a@{0}reflog@" && - maybe_start_httpd - ' - -# SVN 1.7 will truncate "not-a%40{0]" to just "not-a". -# Look at what SVN wound up naming the branch and use that. -# Be sure to escape the @ if it shows up. -non_reflog=$(svn_cmd ls "$svnrepo/pr ject/branches" | grep not-a | sed 's/\///' | sed 's/@/%40/') - -test_expect_success 'test clone with funky branch names' ' - git svn clone -s "$svnrepo/pr ject" project && - ( - cd project && - git rev-parse "refs/remotes/origin/fun%20plugin" && - git rev-parse "refs/remotes/origin/more%20fun%20plugin!" && - git rev-parse "refs/remotes/origin/$scary_ref" && - git rev-parse "refs/remotes/origin/%2Eleading_dot" && - if test_have_prereq !MINGW - then - git rev-parse "refs/remotes/origin/trailing_dot%2E" - fi && - git rev-parse "refs/remotes/origin/trailing_dotlock%2Elock" && - git rev-parse "refs/remotes/origin/$non_reflog" - ) - ' - -test_expect_success 'test dcommit to funky branch' " - ( - cd project && - git reset --hard 'refs/remotes/origin/more%20fun%20plugin!' && - echo hello >> foo && - git commit -m 'hello' -- foo && - git svn dcommit - ) - " - -test_expect_success 'test dcommit to scary branch' ' - ( - cd project && - git reset --hard "refs/remotes/origin/$scary_ref" && - echo urls are scary >> foo && - git commit -m "eep" -- foo && - git svn dcommit - ) - ' - -test_expect_success 'test dcommit to trailing_dotlock branch' ' - ( - cd project && - git reset --hard "refs/remotes/origin/trailing_dotlock%2Elock" && - echo who names branches like this anyway? >> foo && - git commit -m "bar" -- foo && - git svn dcommit - ) - ' - -test_done |