git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v5 0/9] Improve odd encoding integration

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 11, 2019, 06:14 UTC
Message-ID
<xmqq8sonhrd9.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<xmqqd0dzhxgi.fsf@gitster-ct.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 13 quoted lines
> Doan Tran Cong Danh <congdanhqx@gmail.com> 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
Previous: Danh DoanNext: Doan Tran Cong Danh
Message 74 of 89 in “Linux with musl libc improvement”
  1. 0/3 Linux with musl libc improvementDoan Tran Cong Danh, Oct 31, 2019
  2. 1/3 t0028: eliminate non-standard usage of printfDoan Tran Cong Danh, Oct 31, 2019
  3. Jeff KingOct 31, 2019
  4. Danh DoanNov 1, 2019
  5. brian m. carlsonOct 31, 2019
  6. 2/3 configure.ac: define ICONV_OMITS_BOM if necessaryDoan Tran Cong Danh, Oct 31, 2019
  7. Jeff KingOct 31, 2019
  8. brian m. carlsonOct 31, 2019
  9. Danh DoanNov 1, 2019
  10. 3/3 sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh, Oct 31, 2019
  11. Johannes SchindelinOct 31, 2019
  12. Jeff KingOct 31, 2019
  13. Danh DoanNov 1, 2019
  14. 0/3 Linux with musl libc improvementDoan Tran Cong Danh, Nov 1, 2019
  15. 1/3 t0028: eliminate non-standard usage of printfDoan Tran Cong Danh, Nov 1, 2019
  16. Jeff KingNov 1, 2019
  17. 2/3 configure.ac: define ICONV_OMITS_BOM if necessaryDoan Tran Cong Danh, Nov 1, 2019
  18. Jeff KingNov 1, 2019
  19. Danh DoanNov 2, 2019
  20. 3/3 sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh, Nov 1, 2019
  21. Jeff KingNov 1, 2019
  22. Danh DoanNov 2, 2019
  23. Danh DoanNov 2, 2019
  24. Jeff KingNov 5, 2019
  25. Junio C HamanoNov 6, 2019
  26. Jeff KingNov 6, 2019
  27. Danh DoanNov 6, 2019
  28. Jeff KingNov 7, 2019
  29. 0/8 Correct internal working and output encodingDoan Tran Cong Danh, Nov 6, 2019
  30. 1/8 t0028: eliminate non-standard usage of printfDoan Tran Cong Danh, Nov 6, 2019
  31. 2/8 configure.ac: define ICONV_OMITS_BOM if necessaryDoan Tran Cong Danh, Nov 6, 2019
  32. 3/8 t3900: demonstrate git-rebase problem with multi encodingDoan Tran Cong Danh, Nov 6, 2019
  33. 4/8 sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh, Nov 6, 2019
  34. 5/8 sequencer: reencode revert/cherry-pick's todo listDoan Tran Cong Danh, Nov 6, 2019
  35. 6/8 sequencer: reencode squashing commit's messageDoan Tran Cong Danh, Nov 6, 2019
  36. 7/8 sequencer: reencode old merge-commit messageDoan Tran Cong Danh, Nov 6, 2019
  37. Eric SunshineNov 6, 2019
  38. 8/8 sequencer: reencode commit message for am/rebase --show-current-patchDoan Tran Cong Danh, Nov 6, 2019
  39. 0/8 Correct internal working and output encodingDoan Tran Cong Danh, Nov 7, 2019
  40. 1/8 t0028: eliminate non-standard usage of printfDoan Tran Cong Danh, Nov 7, 2019
  41. 2/8 configure.ac: define ICONV_OMITS_BOM if necessaryDoan Tran Cong Danh, Nov 7, 2019
  42. Junio C HamanoNov 7, 2019
  43. 3/8 t3900: demonstrate git-rebase problem with multi encodingDoan Tran Cong Danh, Nov 7, 2019
  44. Jeff KingNov 7, 2019
  45. Danh DoanNov 7, 2019
  46. Jeff KingNov 7, 2019
  47. Danh DoanNov 7, 2019
  48. Jeff KingNov 11, 2019
  49. 4/8 sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh, Nov 7, 2019
  50. Jeff KingNov 7, 2019
  51. 6/8 sequencer: reencode squashing commit's messageDoan Tran Cong Danh, Nov 7, 2019
  52. Jeff KingNov 7, 2019
  53. 5/8 sequencer: reencode revert/cherry-pick's todo listDoan Tran Cong Danh, Nov 7, 2019
  54. Jeff KingNov 7, 2019
  55. 7/8 sequencer: reencode old merge-commit messageDoan Tran Cong Danh, Nov 7, 2019
  56. 8/8 sequencer: reencode commit message for am/rebase --show-current-patchDoan Tran Cong Danh, Nov 7, 2019
  57. Jeff KingNov 7, 2019
  58. Danh DoanNov 7, 2019
  59. Jeff KingNov 7, 2019
  60. Danh DoanNov 7, 2019
  61. 0/9 Improve odd encoding integrationDoan Tran Cong Danh, Nov 8, 2019
  62. 1/9 t0028: eliminate non-standard usage of printfDoan Tran Cong Danh, Nov 8, 2019
  63. 2/9 configure.ac: define ICONV_OMITS_BOM if necessaryDoan Tran Cong Danh, Nov 8, 2019
  64. 4/9 sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh, Nov 8, 2019
  65. 3/9 t3900: demonstrate git-rebase problem with multi encodingDoan Tran Cong Danh, Nov 8, 2019
  66. 5/9 sequencer: reencode revert/cherry-pick's todo listDoan Tran Cong Danh, Nov 8, 2019
  67. 6/9 sequencer: reencode squashing commit's messageDoan Tran Cong Danh, Nov 8, 2019
  68. 7/9 sequencer: reencode old merge-commit messageDoan Tran Cong Danh, Nov 8, 2019
  69. 8/9 sequencer: reencode commit message for am/rebase --show-current-patchDoan Tran Cong Danh, Nov 8, 2019
  70. 9/9 sequencer: fallback to sane label in making rebase todo listDoan Tran Cong Danh, Nov 8, 2019
  71. Junio C HamanoNov 11, 2019
  72. Junio C HamanoNov 11, 2019
  73. Danh DoanNov 11, 2019
  74. Junio C HamanoNov 11, 2019
  75. 0/9 sequencer: handle other encoding betterDoan Tran Cong Danh, Nov 11, 2019
  76. 1/9 t0028: eliminate non-standard usage of printfDoan Tran Cong Danh, Nov 11, 2019
  77. 2/9 configure.ac: define ICONV_OMITS_BOM if necessaryDoan Tran Cong Danh, Nov 11, 2019
  78. 3/9 t3900: demonstrate git-rebase problem with multi encodingDoan Tran Cong Danh, Nov 11, 2019
  79. 4/9 sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh, Nov 11, 2019
  80. 5/9 sequencer: reencode revert/cherry-pick's todo listDoan Tran Cong Danh, Nov 11, 2019
  81. 6/9 sequencer: reencode squashing commit's messageDoan Tran Cong Danh, Nov 11, 2019
  82. 8/9 sequencer: reencode commit message for am/rebase --show-current-patchDoan Tran Cong Danh, Nov 11, 2019
  83. 7/9 sequencer: reencode old merge-commit messageDoan Tran Cong Danh, Nov 11, 2019
  84. 9/9 sequencer: fallback to sane label in making rebase todo listDoan Tran Cong Danh, Nov 11, 2019
  85. Jeff KingNov 11, 2019
  86. Phillip WoodNov 11, 2019
  87. Johannes SchindelinNov 11, 2019
  88. Junio C HamanoNov 12, 2019
  89. Jeff KingNov 11, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.