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/t4016-diff-quote.sh | 88 ----------------------------------- 1 file changed, 88 deletions(-) delete mode 100755 third_party/git/t/t4016-diff-quote.sh (limited to 'third_party/git/t/t4016-diff-quote.sh') diff --git a/third_party/git/t/t4016-diff-quote.sh b/third_party/git/t/t4016-diff-quote.sh deleted file mode 100755 index 9c48e5c2c99a..000000000000 --- a/third_party/git/t/t4016-diff-quote.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2007 Junio C Hamano -# - -test_description='Quoting paths in diff output. -' - -. ./test-lib.sh - -P0='pathname' -P1='pathname with HT' -P2='pathname with SP' -P3='pathname -with LF' -test_have_prereq !MINGW && -echo 2>/dev/null >"$P1" && test -f "$P1" && rm -f "$P1" || { - skip_all='Your filesystem does not allow tabs in filenames' - test_done -} - -test_expect_success setup ' - echo P0.0 >"$P0.0" && - echo P0.1 >"$P0.1" && - echo P0.2 >"$P0.2" && - echo P0.3 >"$P0.3" && - echo P1.0 >"$P1.0" && - echo P1.2 >"$P1.2" && - echo P1.3 >"$P1.3" && - git add . && - git commit -m initial && - git mv "$P0.0" "R$P0.0" && - git mv "$P0.1" "R$P1.0" && - git mv "$P0.2" "R$P2.0" && - git mv "$P0.3" "R$P3.0" && - git mv "$P1.0" "R$P0.1" && - git mv "$P1.2" "R$P2.1" && - git mv "$P1.3" "R$P3.1" && - : -' - -test_expect_success 'setup expected files' ' -cat >expect <<\EOF - rename pathname.1 => "Rpathname\twith HT.0" (100%) - rename pathname.3 => "Rpathname\nwith LF.0" (100%) - rename "pathname\twith HT.3" => "Rpathname\nwith LF.1" (100%) - rename pathname.2 => Rpathname with SP.0 (100%) - rename "pathname\twith HT.2" => Rpathname with SP.1 (100%) - rename pathname.0 => Rpathname.0 (100%) - rename "pathname\twith HT.0" => Rpathname.1 (100%) -EOF -' - -test_expect_success 'git diff --summary -M HEAD' ' - git diff --summary -M HEAD >actual && - test_cmp expect actual -' - -test_expect_success 'git diff --numstat -M HEAD' ' - cat >expect <<-\EOF && - 0 0 pathname.1 => "Rpathname\twith HT.0" - 0 0 pathname.3 => "Rpathname\nwith LF.0" - 0 0 "pathname\twith HT.3" => "Rpathname\nwith LF.1" - 0 0 pathname.2 => Rpathname with SP.0 - 0 0 "pathname\twith HT.2" => Rpathname with SP.1 - 0 0 pathname.0 => Rpathname.0 - 0 0 "pathname\twith HT.0" => Rpathname.1 - EOF - git diff --numstat -M HEAD >actual && - test_cmp expect actual -' - -test_expect_success 'git diff --stat -M HEAD' ' - cat >expect <<-\EOF && - pathname.1 => "Rpathname\twith HT.0" | 0 - pathname.3 => "Rpathname\nwith LF.0" | 0 - "pathname\twith HT.3" => "Rpathname\nwith LF.1" | 0 - pathname.2 => Rpathname with SP.0 | 0 - "pathname\twith HT.2" => Rpathname with SP.1 | 0 - pathname.0 => Rpathname.0 | 0 - "pathname\twith HT.0" => Rpathname.1 | 0 - 7 files changed, 0 insertions(+), 0 deletions(-) - EOF - git diff --stat -M HEAD >actual && - test_i18ncmp expect actual -' - -test_done -- cgit 1.4.1