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/t9002-column.sh | 180 -------------------------------------- 1 file changed, 180 deletions(-) delete mode 100755 third_party/git/t/t9002-column.sh (limited to 'third_party/git/t/t9002-column.sh') diff --git a/third_party/git/t/t9002-column.sh b/third_party/git/t/t9002-column.sh deleted file mode 100755 index 89983527b62f..000000000000 --- a/third_party/git/t/t9002-column.sh +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -test_description='git column' -. ./test-lib.sh - -test_expect_success 'setup' ' - cat >lista <<\EOF -one -two -three -four -five -six -seven -eight -nine -ten -eleven -EOF -' - -test_expect_success 'never' ' - git column --indent=Z --mode=never actual && - test_cmp lista actual -' - -test_expect_success 'always' ' - cat >expected <<\EOF && -Zone -Ztwo -Zthree -Zfour -Zfive -Zsix -Zseven -Zeight -Znine -Zten -Zeleven -EOF - git column --indent=Z --mode=plain actual && - test_cmp expected actual -' - -test_expect_success '80 columns' ' - cat >expected <<\EOF && -one two three four five six seven eight nine ten eleven -EOF - COLUMNS=80 git column --mode=column actual && - test_cmp expected actual -' - -cat >expected <<\EOF -one -two -three -four -five -six -seven -eight -nine -ten -eleven -EOF - -test_expect_success COLUMNS_CAN_BE_1 'COLUMNS = 1' ' - COLUMNS=1 git column --mode=column actual && - test_cmp expected actual -' - -test_expect_success 'width = 1' ' - git column --mode=column --width=1 actual && - test_cmp expected actual -' - -COLUMNS=20 -export COLUMNS - -test_expect_success '20 columns' ' - cat >expected <<\EOF && -one seven -two eight -three nine -four ten -five eleven -six -EOF - git column --mode=column actual && - test_cmp expected actual -' - -test_expect_success '20 columns, nodense' ' - cat >expected <<\EOF && -one seven -two eight -three nine -four ten -five eleven -six -EOF - git column --mode=column,nodense < lista > actual && - test_cmp expected actual -' - -test_expect_success '20 columns, dense' ' - cat >expected <<\EOF && -one five nine -two six ten -three seven eleven -four eight -EOF - git column --mode=column,dense < lista > actual && - test_cmp expected actual -' - -test_expect_success '20 columns, padding 2' ' - cat >expected <<\EOF && -one seven -two eight -three nine -four ten -five eleven -six -EOF - git column --mode=column --padding 2 actual && - test_cmp expected actual -' - -test_expect_success '20 columns, indented' ' - cat >expected <<\EOF && - one seven - two eight - three nine - four ten - five eleven - six -EOF - git column --mode=column --indent=" " actual && - test_cmp expected actual -' - -test_expect_success '20 columns, row first' ' - cat >expected <<\EOF && -one two -three four -five six -seven eight -nine ten -eleven -EOF - git column --mode=row actual && - test_cmp expected actual -' - -test_expect_success '20 columns, row first, nodense' ' - cat >expected <<\EOF && -one two -three four -five six -seven eight -nine ten -eleven -EOF - git column --mode=row,nodense actual && - test_cmp expected actual -' - -test_expect_success '20 columns, row first, dense' ' - cat >expected <<\EOF && -one two three -four five six -seven eight nine -ten eleven -EOF - git column --mode=row,dense actual && - test_cmp expected actual -' - -test_done -- cgit 1.4.1