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/t3419-rebase-patch-id.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/t3419-rebase-patch-id.sh')
-rwxr-xr-x | third_party/git/t/t3419-rebase-patch-id.sh | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/third_party/git/t/t3419-rebase-patch-id.sh b/third_party/git/t/t3419-rebase-patch-id.sh deleted file mode 100755 index 1f32faa4a4db..000000000000 --- a/third_party/git/t/t3419-rebase-patch-id.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh - -test_description='git rebase - test patch id computation' - -. ./test-lib.sh - -scramble () { - i=0 - while read x - do - if test $i -ne 0 - then - echo "$x" - fi - i=$((($i+1) % 10)) - done <"$1" >"$1.new" - mv -f "$1.new" "$1" -} - -test_expect_success 'setup' ' - git commit --allow-empty -m initial && - git tag root -' - -test_expect_success 'setup: 500 lines' ' - rm -f .gitattributes && - git checkout -q -f master && - git reset --hard root && - test_seq 500 >file && - git add file && - git commit -q -m initial && - git branch -f other && - - scramble file && - git add file && - git commit -q -m "change big file" && - - git checkout -q other && - : >newfile && - git add newfile && - git commit -q -m "add small file" && - - git cherry-pick master >/dev/null 2>&1 -' - -test_expect_success 'setup attributes' ' - echo "file binary" >.gitattributes -' - -test_expect_success 'detect upstream patch' ' - git checkout -q master && - scramble file && - git add file && - git commit -q -m "change big file again" && - git checkout -q other^{} && - git rebase master && - git rev-list master...HEAD~ >revs && - test_must_be_empty revs -' - -test_expect_success 'do not drop patch' ' - git branch -f squashed master && - git checkout -q -f squashed && - git reset -q --soft HEAD~2 && - git commit -q -m squashed && - git checkout -q other^{} && - test_must_fail git rebase squashed && - git rebase --quit -' - -test_done |