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/t9116-git-svn-log.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/t9116-git-svn-log.sh')
-rwxr-xr-x | third_party/git/t/t9116-git-svn-log.sh | 149 |
1 files changed, 0 insertions, 149 deletions
diff --git a/third_party/git/t/t9116-git-svn-log.sh b/third_party/git/t/t9116-git-svn-log.sh deleted file mode 100755 index 0a9f1ef366db..000000000000 --- a/third_party/git/t/t9116-git-svn-log.sh +++ /dev/null @@ -1,149 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2007 Eric Wong -# - -test_description='git svn log tests' -. ./lib-git-svn.sh - -test_expect_success 'setup repository and import' ' - mkdir import && - ( - cd import && - for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3 - do - mkdir -p $i && - echo hello >>$i/README || - exit 1 - done && - svn_cmd import -m test . "$svnrepo" - ) && - git svn init "$svnrepo" -T trunk -b branches -t tags && - git svn fetch && - git reset --hard origin/trunk && - echo bye >> README && - git commit -a -m bye && - git svn dcommit && - git reset --hard origin/a && - echo why >> FEEDME && - git update-index --add FEEDME && - git commit -m feedme && - git svn dcommit && - git reset --hard origin/trunk && - echo aye >> README && - git commit -a -m aye && - git svn dcommit && - git reset --hard origin/b && - echo spy >> README && - git commit -a -m spy && - echo try >> README && - git commit -a -m try && - git svn dcommit - ' - -test_expect_success 'run log' " - git reset --hard origin/a && - git svn log -r2 origin/trunk >out && - grep ^r2 out && - git svn log -r4 origin/trunk >out && - grep ^r4 out && - git svn log -r3 >out && - grep ^r3 out - " - -test_expect_success 'run log against a from trunk' " - git reset --hard origin/trunk && - git svn log -r3 origin/a >out && - grep ^r3 out - " - -printf 'r1 \nr2 \nr4 \n' > expected-range-r1-r2-r4 - -test_expect_success 'test ascending revision range' " - git reset --hard origin/trunk && - git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 - - " - -test_expect_success 'test ascending revision range with --show-commit' " - git reset --hard origin/trunk && - git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 - - " - -test_expect_success 'test ascending revision range with --show-commit (sha1)' " - git svn find-rev r1 >expected-range-r1-r2-r4-sha1 && - git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 && - git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 && - git reset --hard origin/trunk && - git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out && - git rev-parse \$(cat out) >actual && - test_cmp expected-range-r1-r2-r4-sha1 actual - " - -printf 'r4 \nr2 \nr1 \n' > expected-range-r4-r2-r1 - -test_expect_success 'test descending revision range' " - git reset --hard origin/trunk && - git svn log -r 4:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4-r2-r1 - - " - -printf 'r1 \nr2 \n' > expected-range-r1-r2 - -test_expect_success 'test ascending revision range with unreachable revision' " - git reset --hard origin/trunk && - git svn log -r 1:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2 - - " - -printf 'r2 \nr1 \n' > expected-range-r2-r1 - -test_expect_success 'test descending revision range with unreachable revision' " - git reset --hard origin/trunk && - git svn log -r 3:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2-r1 - - " - -printf 'r2 \n' > expected-range-r2 - -test_expect_success 'test ascending revision range with unreachable upper boundary revision and 1 commit' " - git reset --hard origin/trunk && - git svn log -r 2:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 - - " - -test_expect_success 'test descending revision range with unreachable upper boundary revision and 1 commit' " - git reset --hard origin/trunk && - git svn log -r 3:2 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 - - " - -printf 'r4 \n' > expected-range-r4 - -test_expect_success 'test ascending revision range with unreachable lower boundary revision and 1 commit' " - git reset --hard origin/trunk && - git svn log -r 3:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 - - " - -test_expect_success 'test descending revision range with unreachable lower boundary revision and 1 commit' " - git reset --hard origin/trunk && - git svn log -r 4:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 - - " - -printf -- '------------------------------------------------------------------------\n' > expected-separator - -test_expect_success 'test ascending revision range with unreachable boundary revisions and no commits' " - git reset --hard origin/trunk && - git svn log -r 5:6 | test_cmp expected-separator - - " - -test_expect_success 'test descending revision range with unreachable boundary revisions and no commits' " - git reset --hard origin/trunk && - git svn log -r 6:5 | test_cmp expected-separator - - " - -test_expect_success 'test ascending revision range with unreachable boundary revisions and 1 commit' " - git reset --hard origin/trunk && - git svn log -r 3:5 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 - - " - -test_expect_success 'test descending revision range with unreachable boundary revisions and 1 commit' " - git reset --hard origin/trunk && - git svn log -r 5:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 - - " - -test_done |