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/t4045-diff-relative.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/t4045-diff-relative.sh')
-rwxr-xr-x | third_party/git/t/t4045-diff-relative.sh | 165 |
1 files changed, 0 insertions, 165 deletions
diff --git a/third_party/git/t/t4045-diff-relative.sh b/third_party/git/t/t4045-diff-relative.sh deleted file mode 100755 index 7be1de736d86..000000000000 --- a/third_party/git/t/t4045-diff-relative.sh +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/sh - -test_description='diff --relative tests' -. ./test-lib.sh - -test_expect_success 'setup' ' - git commit --allow-empty -m empty && - echo content >file1 && - mkdir subdir && - echo other content >subdir/file2 && - blob_file1=$(git hash-object file1) && - blob_file2=$(git hash-object subdir/file2) && - git add . && - git commit -m one -' - -check_diff () { - dir=$1 - shift - expect=$1 - shift - short_blob=$(git rev-parse --short $blob_file2) - cat >expected <<-EOF - diff --git a/$expect b/$expect - new file mode 100644 - index 0000000..$short_blob - --- /dev/null - +++ b/$expect - @@ -0,0 +1 @@ - +other content - EOF - test_expect_success "-p $*" " - git -C '$dir' diff -p $* HEAD^ >actual && - test_cmp expected actual - " -} - -check_numstat () { - dir=$1 - shift - expect=$1 - shift - cat >expected <<-EOF - 1 0 $expect - EOF - test_expect_success "--numstat $*" " - echo '1 0 $expect' >expected && - git -C '$dir' diff --numstat $* HEAD^ >actual && - test_cmp expected actual - " -} - -check_stat () { - dir=$1 - shift - expect=$1 - shift - cat >expected <<-EOF - $expect | 1 + - 1 file changed, 1 insertion(+) - EOF - test_expect_success "--stat $*" " - git -C '$dir' diff --stat $* HEAD^ >actual && - test_i18ncmp expected actual - " -} - -check_raw () { - dir=$1 - shift - expect=$1 - shift - cat >expected <<-EOF - :000000 100644 $ZERO_OID $blob_file2 A $expect - EOF - test_expect_success "--raw $*" " - git -C '$dir' diff --no-abbrev --raw $* HEAD^ >actual && - test_cmp expected actual - " -} - -for type in diff numstat stat raw -do - check_$type . file2 --relative=subdir/ - check_$type . file2 --relative=subdir - check_$type subdir file2 --relative - check_$type . dir/file2 --relative=sub -done - -check_diff_relative_option () { - dir=$1 - shift - expect=$1 - shift - relative_opt=$1 - shift - test_expect_success "config diff.relative $relative_opt -p $*" " - short_blob=\$(git rev-parse --short $blob_file2) && - cat >expected <<-EOF && - diff --git a/$expect b/$expect - new file mode 100644 - index 0000000..\$short_blob - --- /dev/null - +++ b/$expect - @@ -0,0 +1 @@ - +other content - EOF - test_config -C $dir diff.relative $relative_opt && - git -C '$dir' diff -p $* HEAD^ >actual && - test_cmp expected actual - " -} - -check_diff_no_relative_option () { - dir=$1 - shift - expect=$1 - shift - relative_opt=$1 - shift - test_expect_success "config diff.relative $relative_opt -p $*" " - short_blob_file1=\$(git rev-parse --short $blob_file1) && - short_blob_file2=\$(git rev-parse --short $blob_file2) && - cat >expected <<-EOF && - diff --git a/file1 b/file1 - new file mode 100644 - index 0000000..\$short_blob_file1 - --- /dev/null - +++ b/file1 - @@ -0,0 +1 @@ - +content - diff --git a/$expect b/$expect - new file mode 100644 - index 0000000..\$short_blob_file2 - --- /dev/null - +++ b/$expect - @@ -0,0 +1 @@ - +other content - EOF - test_config -C $dir diff.relative $relative_opt && - git -C '$dir' diff -p $* HEAD^ >actual && - test_cmp expected actual - " -} - -check_diff_no_relative_option . subdir/file2 false -check_diff_no_relative_option . subdir/file2 true --no-relative -check_diff_no_relative_option . subdir/file2 false --no-relative -check_diff_no_relative_option subdir subdir/file2 false -check_diff_no_relative_option subdir subdir/file2 true --no-relative -check_diff_no_relative_option subdir subdir/file2 false --no-relative - -check_diff_relative_option . file2 false --relative=subdir/ -check_diff_relative_option . file2 false --relative=subdir -check_diff_relative_option . file2 true --relative=subdir/ -check_diff_relative_option . file2 true --relative=subdir -check_diff_relative_option subdir file2 false --relative -check_diff_relative_option subdir file2 true --relative -check_diff_relative_option subdir file2 true -check_diff_relative_option subdir file2 false --no-relative --relative -check_diff_relative_option subdir file2 true --no-relative --relative -check_diff_relative_option . file2 false --no-relative --relative=subdir -check_diff_relative_option . file2 true --no-relative --relative=subdir - -test_done |