a926c4b904 · matheusbsbs/matheus-bagliano

t/t0000-basic.sh

+1 -1

@@ -271,7 +271,7 @@ test_expect_success 'pretend we have a mix of all possible results' '

271 EOF

272 '

273

274 -test_expect_success C_LOCALE_OUTPUT 'test --verbose' '

274 +test_expect_success 'test --verbose' '

275 run_sub_test_lib_test_err \

276 t1234-verbose "test verbose" --verbose <<-\EOF &&

277 test_expect_success "passing test" true

t/t0201-gettext-fallbacks.sh

+1 -1

@@ -18,7 +18,7 @@ test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set' '

18 test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"

19 '

20

21 -test_expect_success C_LOCALE_OUTPUT 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' '

21 +test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' '

22 echo fallthrough >expect &&

23 echo $GIT_INTERNAL_GETTEXT_SH_SCHEME >actual &&

24 test_cmp expect actual

t/t1430-bad-ref-name.sh

+1 -1

@@ -125,7 +125,7 @@ test_expect_success 'push cannot create a badly named ref' '

125 ! grep -e "broken\.\.\.ref" output

126 '

127

128 -test_expect_failure C_LOCALE_OUTPUT 'push --mirror can delete badly named ref' '

128 +test_expect_failure 'push --mirror can delete badly named ref' '

129 top=$(pwd) &&

130 git init src &&

131 git init dest &&

t/t1512-rev-parse-disambiguation.sh

+7 -7

@@ -314,39 +314,39 @@ test_expect_success 'ambiguous short sha1 ref' '

314 grep "refname.*${REF}.*ambiguous" err

315 '

316

317 -test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (raw)' '

317 +test_expect_success 'ambiguity errors are not repeated (raw)' '

318 test_must_fail git rev-parse 00000 2>stderr &&

319 grep "is ambiguous" stderr >errors &&

320 test_line_count = 1 errors

321 '

322

323 -test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (treeish)' '

323 +test_expect_success 'ambiguity errors are not repeated (treeish)' '

324 test_must_fail git rev-parse 00000:foo 2>stderr &&

325 grep "is ambiguous" stderr >errors &&

326 test_line_count = 1 errors

327 '

328

329 -test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (peel)' '

329 +test_expect_success 'ambiguity errors are not repeated (peel)' '

330 test_must_fail git rev-parse 00000^{commit} 2>stderr &&

331 grep "is ambiguous" stderr >errors &&

332 test_line_count = 1 errors

333 '

334

335 -test_expect_success C_LOCALE_OUTPUT 'ambiguity hints' '

335 +test_expect_success 'ambiguity hints' '

336 test_must_fail git rev-parse 000000000 2>stderr &&

337 grep ^hint: stderr >hints &&

338 # 16 candidates, plus one intro line

339 test_line_count = 17 hints

340 '

341

342 -test_expect_success C_LOCALE_OUTPUT 'ambiguity hints respect type' '

342 +test_expect_success 'ambiguity hints respect type' '

343 test_must_fail git rev-parse 000000000^{commit} 2>stderr &&

344 grep ^hint: stderr >hints &&

345 # 5 commits, 1 tag (which is a committish), plus intro line

346 test_line_count = 7 hints

347 '

348

349 -test_expect_success C_LOCALE_OUTPUT 'failed type-selector still shows hint' '

349 +test_expect_success 'failed type-selector still shows hint' '

350 # these two blobs share the same prefix "ee3d", but neither

351 # will pass for a commit

352 echo 851 | git hash-object --stdin -w &&

@@ -370,7 +370,7 @@ test_expect_success 'core.disambiguate does not override context' '

370 git -c core.disambiguate=committish rev-parse $sha1^{tree}

371 '

372

373 -test_expect_success C_LOCALE_OUTPUT 'ambiguous commits are printed by type first, then hash order' '

373 +test_expect_success 'ambiguous commits are printed by type first, then hash order' '

374 test_must_fail git rev-parse 0000 2>stderr &&

375 grep ^hint: stderr >hints &&

376 grep 0000 hints >objects &&

t/t3404-rebase-interactive.sh

+7 -7

@@ -450,7 +450,7 @@ test_expect_success 'verbose flag is heeded, even after --continue' '

450 grep "^ file1 | 2 +-$" output

451 '

452

453 -test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' '

453 +test_expect_success 'multi-squash only fires up editor once' '

454 base=$(git rev-parse HEAD~4) &&

455 (

456 set_fake_editor &&

@@ -463,7 +463,7 @@ test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' '

463 test 1 = $(git show | grep ONCE | wc -l)

464 '

465

466 -test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' '

466 +test_expect_success 'multi-fixup does not fire up editor' '

467 git checkout -b multi-fixup E &&

468 base=$(git rev-parse HEAD~4) &&

469 (

@@ -514,7 +514,7 @@ test_expect_success 'commit message retained after conflict' '

514 git branch -D conflict-squash

515 '

516

517 -test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messages' '

517 +test_expect_success 'squash and fixup generate correct log messages' '

518 cat >expect-squash-fixup <<-\EOF &&

519 B

520

@@ -541,7 +541,7 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa

541 git branch -D squash-fixup

542 '

543

544 -test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' '

544 +test_expect_success 'squash ignores comments' '

545 git checkout -b skip-comments E &&

546 base=$(git rev-parse HEAD~4) &&

547 (

@@ -557,7 +557,7 @@ test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' '

557 git branch -D skip-comments

558 '

559

560 -test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' '

560 +test_expect_success 'squash ignores blank lines' '

561 git checkout -b skip-blank-lines E &&

562 base=$(git rev-parse HEAD~4) &&

563 (

@@ -995,7 +995,7 @@ test_expect_success 'rebase -ix with several instances of --exec' '

995 test_cmp expected actual

996 '

997

998 -test_expect_success C_LOCALE_OUTPUT 'rebase -ix with --autosquash' '

998 +test_expect_success 'rebase -ix with --autosquash' '

999 git reset --hard execute &&

1000 git checkout -b autosquash &&

1001 echo second >second.txt &&

@@ -1136,7 +1136,7 @@ test_expect_success 'rebase -i --root reword root when root has untracked file c

1136 test "$(git rev-list --count HEAD)" = 2

1137 '

1138

1139 -test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '

1139 +test_expect_success 'rebase --edit-todo does not work on non-interactive rebase' '

1140 git checkout reword-original-root-branch &&

1141 git reset --hard &&

1142 git checkout conflict-branch &&

t/t3415-rebase-autosquash.sh

+5 -5

@@ -306,23 +306,23 @@ test_auto_fixup_fixup () {

306 fi

307 }

308

309 -test_expect_success C_LOCALE_OUTPUT 'fixup! fixup!' '

309 +test_expect_success 'fixup! fixup!' '

310 test_auto_fixup_fixup fixup fixup

311 '

312

313 -test_expect_success C_LOCALE_OUTPUT 'fixup! squash!' '

313 +test_expect_success 'fixup! squash!' '

314 test_auto_fixup_fixup fixup squash

315 '

316

317 -test_expect_success C_LOCALE_OUTPUT 'squash! squash!' '

317 +test_expect_success 'squash! squash!' '

318 test_auto_fixup_fixup squash squash

319 '

320

321 -test_expect_success C_LOCALE_OUTPUT 'squash! fixup!' '

321 +test_expect_success 'squash! fixup!' '

322 test_auto_fixup_fixup squash fixup

323 '

324

325 -test_expect_success C_LOCALE_OUTPUT 'autosquash with custom inst format' '

325 +test_expect_success 'autosquash with custom inst format' '

326 git reset --hard base &&

327 git config --add rebase.instructionFormat "[%an @ %ar] %s" &&

328 echo 2 >file1 &&

t/t3701-add-interactive.sh

+1 -1

@@ -370,7 +370,7 @@ test_expect_success 'setup expected' '

370 '

371

372 # Test splitting the first patch, then adding both

373 -test_expect_success C_LOCALE_OUTPUT 'add first line works' '

373 +test_expect_success 'add first line works' '

374 git commit -am "clear local changes" &&

375 git apply patch &&

376 printf "%s\n" s y y | git add -p file 2>error |

t/t4012-diff-binary.sh

+2 -2

@@ -63,7 +63,7 @@ test_expect_success 'apply --numstat understands diff --binary format' '

63

64 # apply needs to be able to skip the binary material correctly

65 # in order to report the line number of a corrupt patch.

66 -test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '

66 +test_expect_success 'apply detecting corrupt patch correctly' '

67 git diff >output &&

68 sed -e "s/-CIT/xCIT/" <output >broken &&

69 test_must_fail git apply --stat --summary broken 2>detected &&

@@ -73,7 +73,7 @@ test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '

73 test "$detected" = xCIT

74 '

75

76 -test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '

76 +test_expect_success 'apply detecting corrupt patch correctly' '

77 git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&

78 test_must_fail git apply --stat --summary broken 2>detected &&

79 detected=$(cat detected) &&

t/t4205-log-pretty-formats.sh

+1 -1

@@ -126,7 +126,7 @@ test_expect_success 'NUL separation with --stat' '

126 test_i18ncmp expected actual

127 '

128

129 -test_expect_failure C_LOCALE_OUTPUT 'NUL termination with --stat' '

129 +test_expect_failure 'NUL termination with --stat' '

130 stat0_part=$(git diff --stat HEAD^ HEAD) &&

131 stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&

132 printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n0" >expected &&

t/t5300-pack-object.sh

+2 -2

@@ -427,7 +427,7 @@ test_expect_success 'index-pack --strict <pack> works in non-repo' '

427 test_path_is_file foo.idx

428 '

429

430 -test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'index-pack --threads=N or pack.threads=N warns when no pthreads' '

430 +test_expect_success !PTHREADS 'index-pack --threads=N or pack.threads=N warns when no pthreads' '

431 test_must_fail git index-pack --threads=2 2>err &&

432 grep ^warning: err >warnings &&

433 test_line_count = 1 warnings &&

@@ -445,7 +445,7 @@ test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'index-pack --threads=N or pack.th

445 grep -F "no threads support, ignoring pack.threads" err

446 '

447

448 -test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'pack-objects --threads=N or pack.threads=N warns when no pthreads' '

448 +test_expect_success !PTHREADS 'pack-objects --threads=N or pack.threads=N warns when no pthreads' '

449 git pack-objects --threads=2 --stdout --all </dev/null >/dev/null 2>err &&

450 grep ^warning: err >warnings &&

451 test_line_count = 1 warnings &&

t/t5505-remote.sh

+3 -3

@@ -59,7 +59,7 @@ test_expect_success 'add remote whose URL agrees with url.<...>.insteadOf' '

59 git remote add myremote git@host.com:team/repo.git

60 '

61

62 -test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' '

62 +test_expect_success 'remote information for the origin' '

63 (

64 cd test &&

65 tokens_match origin "$(git remote)" &&

@@ -81,7 +81,7 @@ test_expect_success 'add another remote' '

81 )

82 '

83

84 -test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '

84 +test_expect_success 'check remote-tracking' '

85 (

86 cd test &&

87 check_remote_track origin main side &&

@@ -107,7 +107,7 @@ test_expect_success 'remove remote' '

107 )

108 '

109

110 -test_expect_success C_LOCALE_OUTPUT 'remove remote' '

110 +test_expect_success 'remove remote' '

111 (

112 cd test &&

113 tokens_match origin "$(git remote)" &&

t/t5510-fetch.sh

+2 -2

@@ -1097,7 +1097,7 @@ test_expect_success 'fetching with auto-gc does not lock up' '

1097 )

1098 '

1099

1100 -test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '

1100 +test_expect_success 'fetch aligned output' '

1101 git clone . full-output &&

1102 test_commit looooooooooooong-tag &&

1103 (

@@ -1112,7 +1112,7 @@ test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '

1112 test_cmp expect actual

1113 '

1114

1115 -test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '

1115 +test_expect_success 'fetch compact output' '

1116 git clone . compact &&

1117 test_commit extraaa &&

1118 (

t/t5601-clone.sh

+1 -1

@@ -40,7 +40,7 @@ test_expect_success 'clone with excess parameters (2)' '

40

41 '

42

43 -test_expect_success C_LOCALE_OUTPUT 'output from clone' '

43 +test_expect_success 'output from clone' '

44 rm -fr dst &&

45 git clone -n "file://$(pwd)/src" dst >output 2>&1 &&

46 test $(grep Clon output | wc -l) = 1

t/t6423-merge-rename-directories.sh

+1 -1

@@ -2905,7 +2905,7 @@ test_setup_9e () {

2905 )

2906 }

2907

2908 -test_expect_success C_LOCALE_OUTPUT '9e: N-to-1 whammo' '

2908 +test_expect_success '9e: N-to-1 whammo' '

2909 test_setup_9e &&

2910 (

2911 cd 9e &&

t/t7300-clean.sh

+3 -3

@@ -110,7 +110,7 @@ test_expect_success 'git clean with prefix' '

110

111 '

112

113 -test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' '

113 +test_expect_success 'git clean with relative prefix' '

114

115 mkdir -p build docs &&

116 touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&

@@ -123,7 +123,7 @@ test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' '

123 verbose test "$would_clean" = ../src/part3.c

124 '

125

126 -test_expect_success C_LOCALE_OUTPUT 'git clean with absolute path' '

126 +test_expect_success 'git clean with absolute path' '

127

128 mkdir -p build docs &&

129 touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&

@@ -407,7 +407,7 @@ test_expect_success 'clean.requireForce and -f' '

407

408 '

409

410 -test_expect_success C_LOCALE_OUTPUT 'core.excludesfile' '

410 +test_expect_success 'core.excludesfile' '

411

412 echo excludes >excludes &&

413 echo included >included &&

t/t7505-prepare-commit-msg-hook.sh

+2 -2

@@ -218,7 +218,7 @@ test_expect_success 'with hook and editor (merge)' '

218 test_rebase () {

219 expect=$1 &&

220 mode=$2 &&

221 - test_expect_$expect C_LOCALE_OUTPUT "with hook (rebase ${mode:--i})" '

221 + test_expect_$expect "with hook (rebase ${mode:--i})" '

222 test_when_finished "\

223 git rebase --abort

224 git checkout -f main

@@ -307,7 +307,7 @@ test_expect_success 'with failing hook (merge)' '

307

308 '

309

310 -test_expect_success C_LOCALE_OUTPUT 'with failing hook (cherry-pick)' '

310 +test_expect_success 'with failing hook (cherry-pick)' '

311 test_when_finished "git checkout -f main" &&

312 git checkout -B other b &&

313 test_must_fail git cherry-pick rebase-1 2>actual &&

t/t7810-grep.sh

+1 -1

@@ -969,7 +969,7 @@ do

969 "

970 done

971

972 -test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'grep --threads=N or pack.threads=N warns when no pthreads' '

972 +test_expect_success !PTHREADS 'grep --threads=N or pack.threads=N warns when no pthreads' '

973 git grep --threads=2 Hello hello_world 2>err &&

974 grep ^warning: err >warnings &&

975 test_line_count = 1 warnings &&

tests: remove most uses of C_LOCALE_OUTPUT