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/t5524-pull-msg.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/t5524-pull-msg.sh')
-rwxr-xr-x | third_party/git/t/t5524-pull-msg.sh | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/third_party/git/t/t5524-pull-msg.sh b/third_party/git/t/t5524-pull-msg.sh deleted file mode 100755 index c278adaa5a25..000000000000 --- a/third_party/git/t/t5524-pull-msg.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -test_description='git pull message generation' - -. ./test-lib.sh - -dollar='$Dollar' - -test_expect_success setup ' - test_commit initial afile original && - git clone . cloned && - ( - cd cloned && - echo added >bfile && - git add bfile && - test_tick && - git commit -m "add bfile" - ) && - test_tick && test_tick && - echo "second" >afile && - git add afile && - git commit -m "second commit" && - echo "original $dollar" >afile && - git add afile && - git commit -m "do not clobber $dollar signs" -' - -test_expect_success pull ' -( - cd cloned && - git pull --log && - git log -2 && - git cat-file commit HEAD >result && - grep Dollar result -) -' - -test_expect_success '--log=1 limits shortlog length' ' -( - cd cloned && - git reset --hard HEAD^ && - test "$(cat afile)" = original && - test "$(cat bfile)" = added && - git pull --log=1 && - git log -3 && - git cat-file commit HEAD >result && - grep Dollar result && - ! grep "second commit" result -) -' - -test_done |