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/t9150/make-svk-dump | |
| 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/t9150/make-svk-dump')
| -rwxr-xr-x | third_party/git/t/t9150/make-svk-dump | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/third_party/git/t/t9150/make-svk-dump b/third_party/git/t/t9150/make-svk-dump deleted file mode 100755 index 2242f14ebec6..000000000000 --- a/third_party/git/t/t9150/make-svk-dump +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# this script sets up a Subversion repository for Makefile in the -# first ever git merge, as if it were done with svk. -# - -set -e - -svk depotmap foo ~/.svk/foo -svk co /foo/ foo -cd foo -mkdir trunk -mkdir branches -svk add trunk branches -svk commit -m "Setup trunk and branches" -cd trunk - -git cat-file blob 6683463e:Makefile > Makefile -svk add Makefile - -svk commit -m "ancestor" -cd .. -svk cp trunk branches/left - -svk commit -m "make left branch" -cd branches/left/ - -git cat-file blob 5873b67e:Makefile > Makefile -svk commit -m "left update 1" - -cd ../../trunk -git cat-file blob 75118b13:Makefile > Makefile -svk commit -m "trunk update" - -cd ../branches/left -git cat-file blob b5039db6:Makefile > Makefile -svk commit -m "left update 2" - -cd ../../trunk -svk sm /foo/branches/left -# in theory we could delete the "left" branch here, but it's not -# required so don't do it, in case people start getting ideas ;) -svk commit -m "merge branch 'left' into 'trunk'" - -git cat-file blob b51ad431:Makefile > Makefile - -svk diff Makefile && echo "Hey! No differences, magic" - -cd ../.. - -svnadmin dump ~/.svk/foo > svk-merge.dump - -svk co -d foo -rm -rf foo -svk depotmap -d /foo/ -rm -rf ~/.svk/foo - |