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/t4152-am-subjects.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/t4152-am-subjects.sh')
| -rwxr-xr-x | third_party/git/t/t4152-am-subjects.sh | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/third_party/git/t/t4152-am-subjects.sh b/third_party/git/t/t4152-am-subjects.sh deleted file mode 100755 index 4c68245acad3..000000000000 --- a/third_party/git/t/t4152-am-subjects.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh - -test_description='test subject preservation with format-patch | am' -. ./test-lib.sh - -make_patches() { - type=$1 - subject=$2 - test_expect_success "create patches with $type subject" ' - git reset --hard baseline && - echo $type >file && - git commit -a -m "$subject" && - git format-patch -1 --stdout >$type.patch && - git format-patch -1 --stdout -k >$type-k.patch - ' -} - -check_subject() { - git reset --hard baseline && - git am $2 $1.patch && - git log -1 --pretty=format:%B >actual && - test_cmp expect actual -} - -test_expect_success 'setup baseline commit' ' - test_commit baseline file -' - -SHORT_SUBJECT='short subject' -make_patches short "$SHORT_SUBJECT" - -LONG_SUBJECT1='this is a long subject that is virtually guaranteed' -LONG_SUBJECT2='to require wrapping via format-patch if it is all' -LONG_SUBJECT3='going to appear on a single line' -LONG_SUBJECT="$LONG_SUBJECT1 $LONG_SUBJECT2 $LONG_SUBJECT3" -make_patches long "$LONG_SUBJECT" - -MULTILINE_SUBJECT="$LONG_SUBJECT1 -$LONG_SUBJECT2 -$LONG_SUBJECT3" -make_patches multiline "$MULTILINE_SUBJECT" - -echo "$SHORT_SUBJECT" >expect -test_expect_success 'short subject preserved (format-patch | am)' ' - check_subject short -' -test_expect_success 'short subject preserved (format-patch -k | am)' ' - check_subject short-k -' -test_expect_success 'short subject preserved (format-patch -k | am -k)' ' - check_subject short-k -k -' - -echo "$LONG_SUBJECT" >expect -test_expect_success 'long subject preserved (format-patch | am)' ' - check_subject long -' -test_expect_success 'long subject preserved (format-patch -k | am)' ' - check_subject long-k -' -test_expect_success 'long subject preserved (format-patch -k | am -k)' ' - check_subject long-k -k -' - -echo "$LONG_SUBJECT" >expect -test_expect_success 'multiline subject unwrapped (format-patch | am)' ' - check_subject multiline -' -test_expect_success 'multiline subject unwrapped (format-patch -k | am)' ' - check_subject multiline-k -' -echo "$MULTILINE_SUBJECT" >expect -test_expect_success 'multiline subject preserved (format-patch -k | am -k)' ' - check_subject multiline-k -k -' - -test_done |