From 43b1791ec601732ac31195df96781a848360a9ac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 21 Sep 2021 13:03:01 +0300 Subject: chore(3p/git): Unvendor git and track patches instead 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 --- third_party/git/t/t8002-blame.sh | 140 --------------------------------------- 1 file changed, 140 deletions(-) delete mode 100755 third_party/git/t/t8002-blame.sh (limited to 'third_party/git/t/t8002-blame.sh') diff --git a/third_party/git/t/t8002-blame.sh b/third_party/git/t/t8002-blame.sh deleted file mode 100755 index 015973e8fe22..000000000000 --- a/third_party/git/t/t8002-blame.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh - -test_description='git blame' -. ./test-lib.sh - -PROG='git blame -c' -. "$TEST_DIRECTORY"/annotate-tests.sh - -test_expect_success 'setup' ' - hexsz=$(test_oid hexsz) -' - -test_expect_success 'blame untracked file in empty repo' ' - >untracked && - test_must_fail git blame untracked -' - -PROG='git blame -c -e' -test_expect_success 'blame --show-email' ' - check_count \ - "" 1 \ - "" 1 \ - "" 1 \ - "" 1 \ - "" 1 \ - "" 1 \ - "" 1 \ - "" 1 -' - -test_expect_success 'setup showEmail tests' ' - echo "bin: test number 1" >one && - git add one && - GIT_AUTHOR_NAME=name1 \ - GIT_AUTHOR_EMAIL=email1@test.git \ - git commit -m First --date="2010-01-01 01:00:00" && - cat >expected_n <<-\EOF && - (name1 2010-01-01 01:00:00 +0000 1) bin: test number 1 - EOF - cat >expected_e <<-\EOF - ( 2010-01-01 01:00:00 +0000 1) bin: test number 1 - EOF -' - -find_blame () { - sed -e 's/^[^(]*//' -} - -test_expect_success 'blame with no options and no config' ' - git blame one >blame && - find_blame result && - test_cmp expected_n result -' - -test_expect_success 'blame with showemail options' ' - git blame --show-email one >blame1 && - find_blame result && - test_cmp expected_e result && - git blame -e one >blame2 && - find_blame result && - test_cmp expected_e result && - git blame --no-show-email one >blame3 && - find_blame result && - test_cmp expected_n result -' - -test_expect_success 'blame with showEmail config false' ' - git config blame.showEmail false && - git blame one >blame1 && - find_blame result && - test_cmp expected_n result && - git blame --show-email one >blame2 && - find_blame result && - test_cmp expected_e result && - git blame -e one >blame3 && - find_blame result && - test_cmp expected_e result && - git blame --no-show-email one >blame4 && - find_blame result && - test_cmp expected_n result -' - -test_expect_success 'blame with showEmail config true' ' - git config blame.showEmail true && - git blame one >blame1 && - find_blame result && - test_cmp expected_e result && - git blame --no-show-email one >blame2 && - find_blame result && - test_cmp expected_n result -' - -test_expect_success 'set up abbrev tests' ' - test_commit abbrev && - sha1=$(git rev-parse --verify HEAD) && - check_abbrev () { - expect=$1; shift - echo $sha1 | cut -c 1-$expect >expect && - git blame "$@" abbrev.t >actual && - perl -lne "/[0-9a-f]+/ and print \$&" actual.sha && - test_cmp expect actual.sha - } -' - -test_expect_success 'blame --abbrev= works' ' - # non-boundary commits get +1 for alignment - check_abbrev 31 --abbrev=30 HEAD && - check_abbrev 30 --abbrev=30 ^HEAD -' - -test_expect_success 'blame -l aligns regular and boundary commits' ' - check_abbrev $hexsz -l HEAD && - check_abbrev $((hexsz - 1)) -l ^HEAD -' - -test_expect_success 'blame --abbrev with full length behaves like -l' ' - check_abbrev $hexsz --abbrev=$hexsz HEAD && - check_abbrev $((hexsz - 1)) --abbrev=$hexsz ^HEAD -' - -test_expect_success '--no-abbrev works like --abbrev with full length' ' - check_abbrev $hexsz --no-abbrev -' - -test_expect_success '--exclude-promisor-objects does not BUG-crash' ' - test_must_fail git blame --exclude-promisor-objects one -' - -test_expect_success 'blame with uncommitted edits in partial clone does not crash' ' - git init server && - echo foo >server/file.txt && - git -C server add file.txt && - git -C server commit -m file && - - git clone --filter=blob:none "file://$(pwd)/server" client && - echo bar >>client/file.txt && - git -C client blame file.txt -' - -test_done -- cgit 1.4.1