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/t4055-diff-context.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/t4055-diff-context.sh')
-rwxr-xr-x | third_party/git/t/t4055-diff-context.sh | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/third_party/git/t/t4055-diff-context.sh b/third_party/git/t/t4055-diff-context.sh deleted file mode 100755 index 741e0803c1ac..000000000000 --- a/third_party/git/t/t4055-diff-context.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2012 Mozilla Foundation -# - -test_description='diff.context configuration' - -. ./test-lib.sh - -test_expect_success 'setup' ' - cat >template <<-\EOF && - firstline - b - c - d - e - f - preline - TARGET - postline - i - j - k - l - m - n - EOF - sed "/TARGET/d" >x <template && - git update-index --add x && - git commit -m initial && - - sed "s/TARGET/ADDED/" >x <template && - git update-index --add x && - git commit -m next && - - sed "s/TARGET/MODIFIED/" >x <template -' - -test_expect_success 'the default number of context lines is 3' ' - git diff >output && - ! grep "^ d" output && - grep "^ e" output && - grep "^ j" output && - ! grep "^ k" output -' - -test_expect_success 'diff.context honored by "log"' ' - git log -1 -p >output && - ! grep firstline output && - git config diff.context 8 && - git log -1 -p >output && - grep "^ firstline" output -' - -test_expect_success 'The -U option overrides diff.context' ' - git config diff.context 8 && - git log -U4 -1 >output && - ! grep "^ firstline" output -' - -test_expect_success 'diff.context honored by "diff"' ' - git config diff.context 8 && - git diff >output && - grep "^ firstline" output -' - -test_expect_success 'plumbing not affected' ' - git config diff.context 8 && - git diff-files -p >output && - ! grep "^ firstline" output -' - -test_expect_success 'non-integer config parsing' ' - git config diff.context no && - test_must_fail git diff 2>output && - test_i18ngrep "bad numeric config value" output -' - -test_expect_success 'negative integer config parsing' ' - git config diff.context -1 && - test_must_fail git diff 2>output && - test_i18ngrep "bad config variable" output -' - -test_expect_success '-U0 is valid, so is diff.context=0' ' - git config diff.context 0 && - git diff >output && - grep "^-ADDED" output && - grep "^+MODIFIED" output -' - -test_done |