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/t9603-cvsimport-patchsets.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/t9603-cvsimport-patchsets.sh')
| -rwxr-xr-x | third_party/git/t/t9603-cvsimport-patchsets.sh | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/third_party/git/t/t9603-cvsimport-patchsets.sh b/third_party/git/t/t9603-cvsimport-patchsets.sh deleted file mode 100755 index 3e64b11eac5e..000000000000 --- a/third_party/git/t/t9603-cvsimport-patchsets.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -# Structure of the test cvs repository -# -# Message File:Content Commit Time -# Rev 1 a: 1.1 2009-02-21 19:11:43 +0100 -# Rev 2 a: 1.2 b: 1.1 2009-02-21 19:11:14 +0100 -# Rev 3 b: 1.2 2009-02-21 19:11:43 +0100 -# -# As you can see the commit of Rev 3 has the same time as -# Rev 1 this leads to a broken import because of a cvsps -# bug. - -test_description='git cvsimport testing for correct patchset estimation' -. ./lib-cvs.sh - -setup_cvs_test_repository t9603 - -test_expect_failure PERL 'import with criss cross times on revisions' ' - - git cvsimport -p"-x" -C module-git module && - (cd module-git && - git log --pretty=format:%s > ../actual-master && - git log A~2..A --pretty="format:%s %ad" -- > ../actual-A && - echo "" >> ../actual-master && - echo "" >> ../actual-A - ) && - echo "Rev 4 -Rev 3 -Rev 2 -Rev 1" > expect-master && - test_cmp expect-master actual-master && - - echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000 -Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A && - test_cmp expect-A actual-A -' - -test_done |