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/t4049-diff-stat-count.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/t4049-diff-stat-count.sh')
-rwxr-xr-x | third_party/git/t/t4049-diff-stat-count.sh | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/third_party/git/t/t4049-diff-stat-count.sh b/third_party/git/t/t4049-diff-stat-count.sh deleted file mode 100755 index a34121740a4a..000000000000 --- a/third_party/git/t/t4049-diff-stat-count.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# Copyright (c) 2011, Google Inc. - -test_description='diff --stat-count' -. ./test-lib.sh - -test_expect_success 'setup' ' - >a && - >b && - >c && - >d && - git add a b c d && - git commit -m initial -' - -test_expect_success 'mode-only change show as a 0-line change' ' - git reset --hard && - test_chmod +x b d && - echo a >a && - echo c >c && - cat >expect <<-\EOF && - a | 1 + - b | 0 - ... - 4 files changed, 2 insertions(+) - EOF - git diff --stat --stat-count=2 HEAD >actual && - test_i18ncmp expect actual -' - -test_expect_success 'binary changes do not count in lines' ' - git reset --hard && - echo a >a && - echo c >c && - cat "$TEST_DIRECTORY"/test-binary-1.png >d && - cat >expect <<-\EOF && - a | 1 + - c | 1 + - ... - 3 files changed, 2 insertions(+) - EOF - git diff --stat --stat-count=2 >actual && - test_i18ncmp expect actual -' - -test_expect_success 'exclude unmerged entries from total file count' ' - git reset --hard && - echo a >a && - echo b >b && - git ls-files -s a >x && - git rm -f d && - for stage in 1 2 3 - do - sed -e "s/ 0 a/ $stage d/" x - done | - git update-index --index-info && - echo d >d && - cat >expect <<-\EOF && - a | 1 + - b | 1 + - ... - 3 files changed, 3 insertions(+) - EOF - git diff --stat --stat-count=2 >actual && - test_i18ncmp expect actual -' - -test_done |