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/t4063-diff-blobs.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/t4063-diff-blobs.sh')
| -rwxr-xr-x | third_party/git/t/t4063-diff-blobs.sh | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/third_party/git/t/t4063-diff-blobs.sh b/third_party/git/t/t4063-diff-blobs.sh deleted file mode 100755 index bc69e26c524b..000000000000 --- a/third_party/git/t/t4063-diff-blobs.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -test_description='test direct comparison of blobs via git-diff' -. ./test-lib.sh - -run_diff () { - # use full-index to make it easy to match the index line - git diff --full-index "$@" >diff -} - -check_index () { - grep "^index $1\\.\\.$2" diff -} - -check_mode () { - grep "^old mode $1" diff && - grep "^new mode $2" diff -} - -check_paths () { - grep "^diff --git a/$1 b/$2" diff -} - -test_expect_success 'create some blobs' ' - echo one >one && - echo two >two && - chmod +x two && - git add . && - - # cover systems where modes are ignored - git update-index --chmod=+x two && - - git commit -m base && - - sha1_one=$(git rev-parse HEAD:one) && - sha1_two=$(git rev-parse HEAD:two) -' - -test_expect_success 'diff by sha1' ' - run_diff $sha1_one $sha1_two -' -test_expect_success 'index of sha1 diff' ' - check_index $sha1_one $sha1_two -' -test_expect_success 'sha1 diff uses arguments as paths' ' - check_paths $sha1_one $sha1_two -' -test_expect_success 'sha1 diff has no mode change' ' - ! grep mode diff -' - -test_expect_success 'diff by tree:path (run)' ' - run_diff HEAD:one HEAD:two -' -test_expect_success 'index of tree:path diff' ' - check_index $sha1_one $sha1_two -' -test_expect_success 'tree:path diff uses filenames as paths' ' - check_paths one two -' -test_expect_success 'tree:path diff shows mode change' ' - check_mode 100644 100755 -' - -test_expect_success 'diff by ranged tree:path' ' - run_diff HEAD:one..HEAD:two -' -test_expect_success 'index of ranged tree:path diff' ' - check_index $sha1_one $sha1_two -' -test_expect_success 'ranged tree:path diff uses filenames as paths' ' - check_paths one two -' -test_expect_success 'ranged tree:path diff shows mode change' ' - check_mode 100644 100755 -' - -test_expect_success 'diff blob against file' ' - run_diff HEAD:one two -' -test_expect_success 'index of blob-file diff' ' - check_index $sha1_one $sha1_two -' -test_expect_success 'blob-file diff uses filename as paths' ' - check_paths one two -' -test_expect_success FILEMODE 'blob-file diff shows mode change' ' - check_mode 100644 100755 -' - -test_expect_success 'blob-file diff prefers filename to sha1' ' - run_diff $sha1_one two && - check_paths two two -' - -test_done |