Junio C Hamano <gitster@xxxxxxxxx> writes:
> Doan Tran Cong Danh <congdanhqx@xxxxxxxxx> writes:
>
>> t/t3433-rebase-i18n.sh | 84 +++++++++++++++++++++++++++++++
>> t/t3433/ISO8859-1.txt | Bin 0 -> 15 bytes
>> t/t3433/eucJP.txt | Bin 0 -> 68 bytes
>> t/t3900-i18n-commit.sh | 37 ++++++++++++++
>> 7 files changed, 195 insertions(+), 11 deletions(-)
>> create mode 100755 t/t3433-rebase-i18n.sh
>
> Doesn't "make test" barf with test-lint failure with this series
> merged to 'pu'?
>
> In other words, isn't 3433 already taken by another series?
In the meantime, here is what I added to the tip of the series.
Notice that t3434 itself does not have to repeat its own name over
and over this way.
Thanks.
t/{t3433-rebase-i18n.sh => t3434-rebase-i18n.sh} | 10 ++++++----
t/{t3433 => t3434}/ISO8859-1.txt | 0
t/{t3433 => t3434}/eucJP.txt | 0
3 files changed, 6 insertions(+), 4 deletions(-)
rename t/{t3433-rebase-i18n.sh => t3434-rebase-i18n.sh} (89%)
rename t/{t3433 => t3434}/ISO8859-1.txt (100%)
rename t/{t3433 => t3434}/eucJP.txt (100%)
diff --git a/t/t3433-rebase-i18n.sh b/t/t3434-rebase-i18n.sh
similarity index 89%
rename from t/t3433-rebase-i18n.sh
rename to t/t3434-rebase-i18n.sh
index 93e5402849..f693a7f4a0 100755
--- a/t/t3433-rebase-i18n.sh
+++ b/t/t3434-rebase-i18n.sh
@@ -16,8 +16,10 @@ Initial setup:
. ./test-lib.sh
+test_vector="$TEST_DIRECTORY/t3434"
+
compare_msg () {
- iconv -f "$2" -t "$3" "$TEST_DIRECTORY/t3433/$1" >expect &&
+ iconv -f "$2" -t "$3" "$test_vector/$1" >expect &&
git cat-file commit HEAD >raw &&
sed "1,/^$/d" raw >actual &&
test_cmp expect actual
@@ -39,7 +41,7 @@ test_expect_success setup '
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/t3433/eucJP.txt" second &&
+ git merge -F "$test_vector/eucJP.txt" second &&
git config i18n.commitencoding UTF-8 &&
git rebase --rebase-merges master &&
compare_msg eucJP.txt eucJP UTF-8
@@ -48,7 +50,7 @@ test_expect_success 'rebase --rebase-merges update encoding eucJP to 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/t3433/eucJP.txt" second &&
+ git merge -F "$test_vector/eucJP.txt" second &&
git config i18n.commitencoding ISO-2022-JP &&
git rebase --rebase-merges master &&
compare_msg eucJP.txt eucJP ISO-2022-JP
@@ -64,7 +66,7 @@ test_rebase_continue_update_encode () {
echo for-conflict >two.t &&
git add two.t &&
git config i18n.commitencoding $old &&
- git commit -F "$TEST_DIRECTORY/t3433/$msgfile" &&
+ git commit -F "$test_vector/$msgfile" &&
git config i18n.commitencoding $new &&
test_must_fail git rebase -m master &&
test -f .git/rebase-merge/message &&
diff --git a/t/t3433/ISO8859-1.txt b/t/t3434/ISO8859-1.txt
similarity index 100%
rename from t/t3433/ISO8859-1.txt
rename to t/t3434/ISO8859-1.txt
diff --git a/t/t3433/eucJP.txt b/t/t3434/eucJP.txt
similarity index 100%
rename from t/t3433/eucJP.txt
rename to t/t3434/eucJP.txt
--
2.24.0-309-ga5a95dfdb6
