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/t9129-git-svn-i18n-commitencoding.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/t9129-git-svn-i18n-commitencoding.sh')
-rwxr-xr-x | third_party/git/t/t9129-git-svn-i18n-commitencoding.sh | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/third_party/git/t/t9129-git-svn-i18n-commitencoding.sh b/third_party/git/t/t9129-git-svn-i18n-commitencoding.sh deleted file mode 100755 index 2c213ae65405..000000000000 --- a/third_party/git/t/t9129-git-svn-i18n-commitencoding.sh +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2008 Eric Wong - -test_description='git svn honors i18n.commitEncoding in config' - -. ./lib-git-svn.sh - -compare_git_head_with () { - nr=$(wc -l < "$1") - a=7 - b=$(($a + $nr - 1)) - git cat-file commit HEAD | sed -ne "$a,${b}p" >current && - test_cmp current "$1" -} - -prepare_a_utf8_locale - -compare_svn_head_with () { - # extract just the log message and strip out committer info. - # don't use --limit here since svn 1.1.x doesn't have it, - LC_ALL="$a_utf8_locale" svn log $(git svn info --url) | perl -w -e ' - use bytes; - $/ = ("-"x72) . "\n"; - my @x = <STDIN>; - @x = split(/\n/, $x[1]); - splice(@x, 0, 2); - $x[-1] = ""; - print join("\n", @x); - ' > current && - test_cmp current "$1" -} - -for H in ISO8859-1 eucJP ISO-2022-JP -do - test_expect_success "$H setup" ' - mkdir $H && - svn_cmd import -m "$H test" $H "$svnrepo"/$H && - git svn clone "$svnrepo"/$H $H - ' -done - -for H in ISO8859-1 eucJP ISO-2022-JP -do - test_expect_success "$H commit on git side" ' - ( - cd $H && - git config i18n.commitencoding $H && - git checkout -b t refs/remotes/git-svn && - echo $H >F && - git add F && - git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt && - E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") && - test "z$E" = "z$H" && - compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt - ) - ' -done - -for H in ISO8859-1 eucJP ISO-2022-JP -do - test_expect_success "$H dcommit to svn" ' - ( - cd $H && - git svn dcommit && - git cat-file commit HEAD | grep git-svn-id: && - E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") && - test "z$E" = "z$H" && - compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt - ) - ' -done - -test_expect_success UTF8 'ISO-8859-1 should match UTF-8 in svn' ' - ( - cd ISO8859-1 && - compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt - ) -' - -for H in eucJP ISO-2022-JP -do - test_expect_success UTF8 "$H should match UTF-8 in svn" ' - ( - cd $H && - compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt - ) - ' -done - -test_done |