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/t3434-rebase-i18n.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/t3434-rebase-i18n.sh')
-rwxr-xr-x | third_party/git/t/t3434-rebase-i18n.sh | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/third_party/git/t/t3434-rebase-i18n.sh b/third_party/git/t/t3434-rebase-i18n.sh deleted file mode 100755 index c7c835cde9b2..000000000000 --- a/third_party/git/t/t3434-rebase-i18n.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2019 Doan Tran Cong Danh -# - -test_description='rebase with changing encoding - -Initial setup: - -1 - 2 master - \ - 3 - 4 first - \ - 5 - 6 second -' - -. ./test-lib.sh - -compare_msg () { - iconv -f "$2" -t "$3" "$TEST_DIRECTORY/t3434/$1" >expect && - git cat-file commit HEAD >raw && - sed "1,/^$/d" raw >actual && - test_cmp expect actual -} - -test_expect_success setup ' - test_commit one && - git branch first && - test_commit two && - git switch first && - test_commit three && - git branch second && - test_commit four && - git switch second && - test_commit five && - test_commit six -' - -test_expect_success 'rebase --rebase-merges update encoding eucJP to UTF-8' ' - git switch -c merge-eucJP-UTF-8 first && - git config i18n.commitencoding eucJP && - git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second && - git config i18n.commitencoding UTF-8 && - git rebase --rebase-merges master && - compare_msg eucJP.txt eucJP UTF-8 -' - -test_expect_success 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP' ' - git switch -c merge-eucJP-ISO-2022-JP first && - git config i18n.commitencoding eucJP && - git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second && - git config i18n.commitencoding ISO-2022-JP && - git rebase --rebase-merges master && - compare_msg eucJP.txt eucJP ISO-2022-JP -' - -test_rebase_continue_update_encode () { - old=$1 - new=$2 - msgfile=$3 - test_expect_success "rebase --continue update from $old to $new" ' - (git rebase --abort || : abort current git-rebase failure) && - git switch -c conflict-$old-$new one && - echo for-conflict >two.t && - git add two.t && - git config i18n.commitencoding $old && - git commit -F "$TEST_DIRECTORY/t3434/$msgfile" && - git config i18n.commitencoding $new && - test_must_fail git rebase -m master && - test -f .git/rebase-merge/message && - git stripspace <.git/rebase-merge/message >two.t && - git add two.t && - git rebase --continue && - compare_msg $msgfile $old $new && - : git-commit assume invalid utf-8 is latin1 && - test_cmp expect two.t - ' -} - -test_rebase_continue_update_encode ISO-8859-1 UTF-8 ISO8859-1.txt -test_rebase_continue_update_encode eucJP UTF-8 eucJP.txt -test_rebase_continue_update_encode eucJP ISO-2022-JP eucJP.txt - -test_done |