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/t8008-blame-formats.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/t8008-blame-formats.sh')
| -rwxr-xr-x | third_party/git/t/t8008-blame-formats.sh | 109 |
1 files changed, 0 insertions, 109 deletions
diff --git a/third_party/git/t/t8008-blame-formats.sh b/third_party/git/t/t8008-blame-formats.sh deleted file mode 100755 index ae4b579d245c..000000000000 --- a/third_party/git/t/t8008-blame-formats.sh +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh - -test_description='blame output in various formats on a simple case' -. ./test-lib.sh - -test_expect_success 'setup' ' - echo a >file && - git add file && - test_tick && - git commit -m one && - echo b >>file && - echo c >>file && - echo d >>file && - test_tick && - git commit -a -m two && - ID1=$(git rev-parse HEAD^) && - shortID1="^$(git rev-parse HEAD^ |cut -c 1-17)" && - ID2=$(git rev-parse HEAD) && - shortID2="$(git rev-parse HEAD |cut -c 1-18)" -' - -cat >expect <<EOF -$shortID1 (A U Thor 2005-04-07 15:13:13 -0700 1) a -$shortID2 (A U Thor 2005-04-07 15:14:13 -0700 2) b -$shortID2 (A U Thor 2005-04-07 15:14:13 -0700 3) c -$shortID2 (A U Thor 2005-04-07 15:14:13 -0700 4) d -EOF -test_expect_success 'normal blame output' ' - git blame --abbrev=17 file >actual && - test_cmp expect actual -' - -COMMIT1="author A U Thor -author-mail <author@example.com> -author-time 1112911993 -author-tz -0700 -committer C O Mitter -committer-mail <committer@example.com> -committer-time 1112911993 -committer-tz -0700 -summary one -boundary -filename file" -COMMIT2="author A U Thor -author-mail <author@example.com> -author-time 1112912053 -author-tz -0700 -committer C O Mitter -committer-mail <committer@example.com> -committer-time 1112912053 -committer-tz -0700 -summary two -previous $ID1 file -filename file" - -cat >expect <<EOF -$ID1 1 1 1 -$COMMIT1 - a -$ID2 2 2 3 -$COMMIT2 - b -$ID2 3 3 - c -$ID2 4 4 - d -EOF -test_expect_success 'blame --porcelain output' ' - git blame --porcelain file >actual && - test_cmp expect actual -' - -cat >expect <<EOF -$ID1 1 1 1 -$COMMIT1 - a -$ID2 2 2 3 -$COMMIT2 - b -$ID2 3 3 -$COMMIT2 - c -$ID2 4 4 -$COMMIT2 - d -EOF -test_expect_success 'blame --line-porcelain output' ' - git blame --line-porcelain file >actual && - test_cmp expect actual -' - -test_expect_success '--porcelain detects first non-blank line as subject' ' - ( - GIT_INDEX_FILE=.git/tmp-index && - export GIT_INDEX_FILE && - echo "This is it" >single-file && - git add single-file && - tree=$(git write-tree) && - commit=$(printf "%s\n%s\n%s\n\n\n \noneline\n\nbody\n" \ - "tree $tree" \ - "author A <a@b.c> 123456789 +0000" \ - "committer C <c@d.e> 123456789 +0000" | - git hash-object -w -t commit --stdin) && - git blame --porcelain $commit -- single-file >output && - grep "^summary oneline$" output - ) -' - -test_done |