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/t0026-eol-config.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/t0026-eol-config.sh')
-rwxr-xr-x | third_party/git/t/t0026-eol-config.sh | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/third_party/git/t/t0026-eol-config.sh b/third_party/git/t/t0026-eol-config.sh deleted file mode 100755 index c5203e232c8b..000000000000 --- a/third_party/git/t/t0026-eol-config.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -test_description='CRLF conversion' - -. ./test-lib.sh - -has_cr() { - tr '\015' Q <"$1" | grep Q >/dev/null -} - -test_expect_success setup ' - - git config core.autocrlf false && - - echo "one text" > .gitattributes && - - for w in Hello world how are you; do echo $w; done >one && - for w in I am very very fine thank you; do echo $w; done >two && - git add . && - - git commit -m initial && - - one=$(git rev-parse HEAD:one) && - two=$(git rev-parse HEAD:two) && - - echo happy. -' - -test_expect_success 'eol=lf puts LFs in normalized file' ' - - rm -f .gitattributes tmp one two && - git config core.eol lf && - git read-tree --reset -u HEAD && - - ! has_cr one && - ! has_cr two && - onediff=$(git diff one) && - twodiff=$(git diff two) && - test -z "$onediff" && test -z "$twodiff" -' - -test_expect_success 'eol=crlf puts CRLFs in normalized file' ' - - rm -f .gitattributes tmp one two && - git config core.eol crlf && - git read-tree --reset -u HEAD && - - has_cr one && - ! has_cr two && - onediff=$(git diff one) && - twodiff=$(git diff two) && - test -z "$onediff" && test -z "$twodiff" -' - -test_expect_success 'autocrlf=true overrides eol=lf' ' - - rm -f .gitattributes tmp one two && - git config core.eol lf && - git config core.autocrlf true && - git read-tree --reset -u HEAD && - - has_cr one && - has_cr two && - onediff=$(git diff one) && - twodiff=$(git diff two) && - test -z "$onediff" && test -z "$twodiff" -' - -test_expect_success 'autocrlf=true overrides unset eol' ' - - rm -f .gitattributes tmp one two && - git config --unset-all core.eol && - git config core.autocrlf true && - git read-tree --reset -u HEAD && - - has_cr one && - has_cr two && - onediff=$(git diff one) && - twodiff=$(git diff two) && - test -z "$onediff" && test -z "$twodiff" -' - -test_expect_success NATIVE_CRLF 'eol native is crlf' ' - - rm -rf native_eol && mkdir native_eol && - ( - cd native_eol && - printf "*.txt text\n" >.gitattributes && - printf "one\r\ntwo\r\nthree\r\n" >filedos.txt && - printf "one\ntwo\nthree\n" >fileunix.txt && - git init && - git config core.autocrlf false && - git config core.eol native && - git add filedos.txt fileunix.txt && - git commit -m "first" && - rm file*.txt && - git reset --hard HEAD && - has_cr filedos.txt && - has_cr fileunix.txt - ) -' - -test_done |