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/t7421-submodule-summary-add.sh | 69 ------------------------ 1 file changed, 69 deletions(-) delete mode 100755 third_party/git/t/t7421-submodule-summary-add.sh (limited to 'third_party/git/t/t7421-submodule-summary-add.sh') diff --git a/third_party/git/t/t7421-submodule-summary-add.sh b/third_party/git/t/t7421-submodule-summary-add.sh deleted file mode 100755 index b070f13714a7..000000000000 --- a/third_party/git/t/t7421-submodule-summary-add.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2020 Shourya Shukla -# - -test_description='Summary support for submodules, adding them using git submodule add - -This test script tries to verify the sanity of summary subcommand of git submodule -while making sure to add submodules using `git submodule add` instead of -`git add` as done in t7401. -' - -. ./test-lib.sh - -test_expect_success 'summary test environment setup' ' - git init sm && - test_commit -C sm "add file" file file-content file-tag && - - git submodule add ./sm my-subm && - test_tick && - git commit -m "add submodule" -' - -test_expect_success 'submodule summary output for initialized submodule' ' - test_commit -C sm "add file2" file2 file2-content file2-tag && - git submodule update --remote && - test_tick && - git commit -m "update submodule" my-subm && - git submodule summary HEAD^ >actual && - rev1=$(git -C sm rev-parse --short HEAD^) && - rev2=$(git -C sm rev-parse --short HEAD) && - cat >expected <<-EOF && - * my-subm ${rev1}...${rev2} (1): - > add file2 - - EOF - test_cmp expected actual -' - -test_expect_success 'submodule summary output for deinitialized submodule' ' - git submodule deinit my-subm && - git submodule summary HEAD^ >actual && - test_must_be_empty actual && - git submodule update --init my-subm && - git submodule summary HEAD^ >actual && - rev1=$(git -C sm rev-parse --short HEAD^) && - rev2=$(git -C sm rev-parse --short HEAD) && - cat >expected <<-EOF && - * my-subm ${rev1}...${rev2} (1): - > add file2 - - EOF - test_cmp expected actual -' - -test_expect_success 'submodule summary output for submodules with changed paths' ' - git mv my-subm subm && - git commit -m "change submodule path" && - rev=$(git -C sm rev-parse --short HEAD^) && - git submodule summary HEAD^^ -- my-subm >actual 2>err && - test_must_be_empty err && - cat >expected <<-EOF && - * my-subm ${rev}...0000000: - - EOF - test_cmp expected actual -' - -test_done -- cgit 1.4.1