t99*: adjust the references to the default branch name "main"
Carefully excluding t9902, which sees independent development elsewhere at the time of writing, we use `main` as the default branch name in t9903. This trick was performed via $ (cd t && sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \ -e 's/Master/Main/g' -- t99*.sh lib-cvs.sh && git checkout HEAD -- t9902\*) This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main` for all tests (except the ones we specifically excluded for now). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Nov 18, 2020 at 23:44 UTC
8dcf73c5c94077fa83aa53ae427183b70fd4b6ca
1 file changed
+58
-58
t/t9903-bash-prompt.sh
+58
-58
@@ -5,7 +5,7 @@
5
6
test_description='test git-specific bash prompt functions'
7
8
-GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
8
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
9
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
11
. ./lib-bash.sh
@@ -31,7 +31,7 @@ test_expect_success 'setup for prompt tests' '
31
echo 3 >file &&
32
git commit -m "third b1" file &&
33
git tag -a -m msg2 t2 &&
34
- git checkout -b b2 master &&
34
+ git checkout -b b2 main &&
35
echo 0 >file &&
36
git commit -m "second b2" file &&
37
echo 00 >file &&
@@ -40,20 +40,20 @@ test_expect_success 'setup for prompt tests' '
40
git commit -m "yet another b2" file &&
41
mkdir ignored_dir &&
42
echo "ignored_dir/" >>.gitignore &&
43
- git checkout master
43
+ git checkout main
44
'
45
46
test_expect_success 'prompt - branch name' '
47
- printf " (master)" >expected &&
47
+ printf " (main)" >expected &&
48
__git_ps1 >"$actual" &&
49
test_cmp expected "$actual"
50
'
51
52
test_expect_success SYMLINKS 'prompt - branch name - symlink symref' '
53
- printf " (master)" >expected &&
54
- test_when_finished "git checkout master" &&
53
+ printf " (main)" >expected &&
54
+ test_when_finished "git checkout main" &&
55
test_config core.preferSymlinkRefs true &&
56
- git checkout master &&
56
+ git checkout main &&
57
__git_ps1 >"$actual" &&
58
test_cmp expected "$actual"
59
'
@@ -61,7 +61,7 @@ test_expect_success SYMLINKS 'prompt - branch name - symlink symref' '
61
test_expect_success 'prompt - unborn branch' '
62
printf " (unborn)" >expected &&
63
git checkout --orphan unborn &&
64
- test_when_finished "git checkout master" &&
64
+ test_when_finished "git checkout main" &&
65
__git_ps1 >"$actual" &&
66
test_cmp expected "$actual"
67
'
@@ -75,7 +75,7 @@ test_expect_success FUNNYNAMES 'prompt - with newline in path' '
75
with
76
newline" &&
77
mkdir "$repo_with_newline" &&
78
- printf " (master)" >expected &&
78
+ printf " (main)" >expected &&
79
git init "$repo_with_newline" &&
80
test_when_finished "rm -rf \"$repo_with_newline\"" &&
81
mkdir "$repo_with_newline"/subdir &&
@@ -90,7 +90,7 @@ test_expect_success 'prompt - detached head' '
90
printf " ((%s...))" $(git log -1 --format="%h" --abbrev=13 b1^) >expected &&
91
test_config core.abbrev 13 &&
92
git checkout b1^ &&
93
- test_when_finished "git checkout master" &&
93
+ test_when_finished "git checkout main" &&
94
__git_ps1 >"$actual" &&
95
test_cmp expected "$actual"
96
'
@@ -98,7 +98,7 @@ test_expect_success 'prompt - detached head' '
98
test_expect_success 'prompt - describe detached head - contains' '
99
printf " ((t2~1))" >expected &&
100
git checkout b1^ &&
101
- test_when_finished "git checkout master" &&
101
+ test_when_finished "git checkout main" &&
102
(
103
GIT_PS1_DESCRIBE_STYLE=contains &&
104
__git_ps1 >"$actual"
@@ -109,7 +109,7 @@ test_expect_success 'prompt - describe detached head - contains' '
109
test_expect_success 'prompt - describe detached head - branch' '
110
printf " ((tags/t2~1))" >expected &&
111
git checkout b1^ &&
112
- test_when_finished "git checkout master" &&
112
+ test_when_finished "git checkout main" &&
113
(
114
GIT_PS1_DESCRIBE_STYLE=branch &&
115
__git_ps1 >"$actual"
@@ -120,7 +120,7 @@ test_expect_success 'prompt - describe detached head - branch' '
120
test_expect_success 'prompt - describe detached head - describe' '
121
printf " ((t1-1-g%s))" $(git log -1 --format="%h" b1^) >expected &&
122
git checkout b1^ &&
123
- test_when_finished "git checkout master" &&
123
+ test_when_finished "git checkout main" &&
124
(
125
GIT_PS1_DESCRIBE_STYLE=describe &&
126
__git_ps1 >"$actual"
@@ -131,7 +131,7 @@ test_expect_success 'prompt - describe detached head - describe' '
131
test_expect_success 'prompt - describe detached head - default' '
132
printf " ((t2))" >expected &&
133
git checkout --detach b1 &&
134
- test_when_finished "git checkout master" &&
134
+ test_when_finished "git checkout main" &&
135
__git_ps1 >"$actual" &&
136
test_cmp expected "$actual"
137
'
@@ -155,7 +155,7 @@ test_expect_success 'prompt - deep inside .git directory' '
155
'
156
157
test_expect_success 'prompt - inside bare repository' '
158
- printf " (BARE:master)" >expected &&
158
+ printf " (BARE:main)" >expected &&
159
git init --bare bare.git &&
160
test_when_finished "rm -rf bare.git" &&
161
(
@@ -175,7 +175,7 @@ test_expect_success 'prompt - interactive rebase' '
175
test_when_finished "rm -f fake_editor.sh" &&
176
test_set_editor "$TRASH_DIRECTORY/fake_editor.sh" &&
177
git checkout b1 &&
178
- test_when_finished "git checkout master" &&
178
+ test_when_finished "git checkout main" &&
179
git rebase -i HEAD^ &&
180
test_when_finished "git rebase --abort" &&
181
__git_ps1 >"$actual" &&
@@ -185,7 +185,7 @@ test_expect_success 'prompt - interactive rebase' '
185
test_expect_success 'prompt - rebase merge' '
186
printf " (b2|REBASE 1/3)" >expected &&
187
git checkout b2 &&
188
- test_when_finished "git checkout master" &&
188
+ test_when_finished "git checkout main" &&
189
test_must_fail git rebase --merge b1 b2 &&
190
test_when_finished "git rebase --abort" &&
191
__git_ps1 >"$actual" &&
@@ -195,7 +195,7 @@ test_expect_success 'prompt - rebase merge' '
195
test_expect_success 'prompt - rebase am' '
196
printf " (b2|REBASE 1/3)" >expected &&
197
git checkout b2 &&
198
- test_when_finished "git checkout master" &&
198
+ test_when_finished "git checkout main" &&
199
test_must_fail git rebase --apply b1 b2 &&
200
test_when_finished "git rebase --abort" &&
201
__git_ps1 >"$actual" &&
@@ -205,7 +205,7 @@ test_expect_success 'prompt - rebase am' '
205
test_expect_success 'prompt - merge' '
206
printf " (b1|MERGING)" >expected &&
207
git checkout b1 &&
208
- test_when_finished "git checkout master" &&
208
+ test_when_finished "git checkout main" &&
209
test_must_fail git merge b2 &&
210
test_when_finished "git reset --hard" &&
211
__git_ps1 >"$actual" &&
@@ -213,7 +213,7 @@ test_expect_success 'prompt - merge' '
213
'
214
215
test_expect_success 'prompt - cherry-pick' '
216
- printf " (master|CHERRY-PICKING)" >expected &&
216
+ printf " (main|CHERRY-PICKING)" >expected &&
217
test_must_fail git cherry-pick b1 b1^ &&
218
test_when_finished "git cherry-pick --abort" &&
219
__git_ps1 >"$actual" &&
@@ -225,7 +225,7 @@ test_expect_success 'prompt - cherry-pick' '
225
'
226
227
test_expect_success 'prompt - revert' '
228
- printf " (master|REVERTING)" >expected &&
228
+ printf " (main|REVERTING)" >expected &&
229
test_must_fail git revert b1^ b1 &&
230
test_when_finished "git revert --abort" &&
231
__git_ps1 >"$actual" &&
@@ -237,7 +237,7 @@ test_expect_success 'prompt - revert' '
237
'
238
239
test_expect_success 'prompt - bisect' '
240
- printf " (master|BISECTING)" >expected &&
240
+ printf " (main|BISECTING)" >expected &&
241
git bisect start &&
242
test_when_finished "git bisect reset" &&
243
__git_ps1 >"$actual" &&
@@ -245,7 +245,7 @@ test_expect_success 'prompt - bisect' '
245
'
246
247
test_expect_success 'prompt - dirty status indicator - clean' '
248
- printf " (master)" >expected &&
248
+ printf " (main)" >expected &&
249
(
250
GIT_PS1_SHOWDIRTYSTATE=y &&
251
__git_ps1 >"$actual"
@@ -254,7 +254,7 @@ test_expect_success 'prompt - dirty status indicator - clean' '
254
'
255
256
test_expect_success 'prompt - dirty status indicator - dirty worktree' '
257
- printf " (master *)" >expected &&
257
+ printf " (main *)" >expected &&
258
echo "dirty" >file &&
259
test_when_finished "git reset --hard" &&
260
(
@@ -265,7 +265,7 @@ test_expect_success 'prompt - dirty status indicator - dirty worktree' '
265
'
266
267
test_expect_success 'prompt - dirty status indicator - dirty index' '
268
- printf " (master +)" >expected &&
268
+ printf " (main +)" >expected &&
269
echo "dirty" >file &&
270
test_when_finished "git reset --hard" &&
271
git add -u &&
@@ -277,7 +277,7 @@ test_expect_success 'prompt - dirty status indicator - dirty index' '
277
'
278
279
test_expect_success 'prompt - dirty status indicator - dirty index and worktree' '
280
- printf " (master *+)" >expected &&
280
+ printf " (main *+)" >expected &&
281
echo "dirty index" >file &&
282
test_when_finished "git reset --hard" &&
283
git add -u &&
@@ -291,7 +291,7 @@ test_expect_success 'prompt - dirty status indicator - dirty index and worktree'
291
292
test_expect_success 'prompt - dirty status indicator - orphan branch - clean' '
293
printf " (orphan #)" >expected &&
294
- test_when_finished "git checkout master" &&
294
+ test_when_finished "git checkout main" &&
295
git checkout --orphan orphan &&
296
git reset --hard &&
297
(
@@ -303,7 +303,7 @@ test_expect_success 'prompt - dirty status indicator - orphan branch - clean' '
303
304
test_expect_success 'prompt - dirty status indicator - orphan branch - dirty index' '
305
printf " (orphan +)" >expected &&
306
- test_when_finished "git checkout master" &&
306
+ test_when_finished "git checkout main" &&
307
git checkout --orphan orphan &&
308
(
309
GIT_PS1_SHOWDIRTYSTATE=y &&
@@ -314,7 +314,7 @@ test_expect_success 'prompt - dirty status indicator - orphan branch - dirty ind
314
315
test_expect_success 'prompt - dirty status indicator - orphan branch - dirty index and worktree' '
316
printf " (orphan *+)" >expected &&
317
- test_when_finished "git checkout master" &&
317
+ test_when_finished "git checkout main" &&
318
git checkout --orphan orphan &&
319
>file &&
320
(
@@ -325,7 +325,7 @@ test_expect_success 'prompt - dirty status indicator - orphan branch - dirty ind
325
'
326
327
test_expect_success 'prompt - dirty status indicator - shell variable unset with config disabled' '
328
- printf " (master)" >expected &&
328
+ printf " (main)" >expected &&
329
echo "dirty" >file &&
330
test_when_finished "git reset --hard" &&
331
test_config bash.showDirtyState false &&
@@ -337,7 +337,7 @@ test_expect_success 'prompt - dirty status indicator - shell variable unset with
337
'
338
339
test_expect_success 'prompt - dirty status indicator - shell variable unset with config enabled' '
340
- printf " (master)" >expected &&
340
+ printf " (main)" >expected &&
341
echo "dirty" >file &&
342
test_when_finished "git reset --hard" &&
343
test_config bash.showDirtyState true &&
@@ -349,7 +349,7 @@ test_expect_success 'prompt - dirty status indicator - shell variable unset with
349
'
350
351
test_expect_success 'prompt - dirty status indicator - shell variable set with config disabled' '
352
- printf " (master)" >expected &&
352
+ printf " (main)" >expected &&
353
echo "dirty" >file &&
354
test_when_finished "git reset --hard" &&
355
test_config bash.showDirtyState false &&
@@ -361,7 +361,7 @@ test_expect_success 'prompt - dirty status indicator - shell variable set with c
361
'
362
363
test_expect_success 'prompt - dirty status indicator - shell variable set with config enabled' '
364
- printf " (master *)" >expected &&
364
+ printf " (main *)" >expected &&
365
echo "dirty" >file &&
366
test_when_finished "git reset --hard" &&
367
test_config bash.showDirtyState true &&
@@ -385,7 +385,7 @@ test_expect_success 'prompt - dirty status indicator - not shown inside .git dir
385
'
386
387
test_expect_success 'prompt - stash status indicator - no stash' '
388
- printf " (master)" >expected &&
388
+ printf " (main)" >expected &&
389
(
390
GIT_PS1_SHOWSTASHSTATE=y &&
391
__git_ps1 >"$actual"
@@ -394,7 +394,7 @@ test_expect_success 'prompt - stash status indicator - no stash' '
394
'
395
396
test_expect_success 'prompt - stash status indicator - stash' '
397
- printf " (master $)" >expected &&
397
+ printf " (main $)" >expected &&
398
echo 2 >file &&
399
git stash &&
400
test_when_finished "git stash drop" &&
@@ -420,7 +420,7 @@ test_expect_success 'prompt - stash status indicator - not shown inside .git dir
420
'
421
422
test_expect_success 'prompt - untracked files status indicator - no untracked files' '
423
- printf " (master)" >expected &&
423
+ printf " (main)" >expected &&
424
(
425
GIT_PS1_SHOWUNTRACKEDFILES=y &&
426
cd otherrepo &&
@@ -430,7 +430,7 @@ test_expect_success 'prompt - untracked files status indicator - no untracked fi
430
'
431
432
test_expect_success 'prompt - untracked files status indicator - untracked files' '
433
- printf " (master %%)" >expected &&
433
+ printf " (main %%)" >expected &&
434
(
435
GIT_PS1_SHOWUNTRACKEDFILES=y &&
436
__git_ps1 >"$actual"
@@ -439,7 +439,7 @@ test_expect_success 'prompt - untracked files status indicator - untracked files
439
'
440
441
test_expect_success 'prompt - untracked files status indicator - empty untracked dir' '
442
- printf " (master)" >expected &&
442
+ printf " (main)" >expected &&
443
mkdir otherrepo/untracked-dir &&
444
test_when_finished "rm -rf otherrepo/untracked-dir" &&
445
(
@@ -451,7 +451,7 @@ test_expect_success 'prompt - untracked files status indicator - empty untracked
451
'
452
453
test_expect_success 'prompt - untracked files status indicator - non-empty untracked dir' '
454
- printf " (master %%)" >expected &&
454
+ printf " (main %%)" >expected &&
455
mkdir otherrepo/untracked-dir &&
456
test_when_finished "rm -rf otherrepo/untracked-dir" &&
457
>otherrepo/untracked-dir/untracked-file &&
@@ -464,7 +464,7 @@ test_expect_success 'prompt - untracked files status indicator - non-empty untra
464
'
465
466
test_expect_success 'prompt - untracked files status indicator - untracked files outside cwd' '
467
- printf " (master %%)" >expected &&
467
+ printf " (main %%)" >expected &&
468
(
469
mkdir -p ignored_dir &&
470
cd ignored_dir &&
@@ -475,7 +475,7 @@ test_expect_success 'prompt - untracked files status indicator - untracked files
475
'
476
477
test_expect_success 'prompt - untracked files status indicator - shell variable unset with config disabled' '
478
- printf " (master)" >expected &&
478
+ printf " (main)" >expected &&
479
test_config bash.showUntrackedFiles false &&
480
(
481
sane_unset GIT_PS1_SHOWUNTRACKEDFILES &&
@@ -485,7 +485,7 @@ test_expect_success 'prompt - untracked files status indicator - shell variable
485
'
486
487
test_expect_success 'prompt - untracked files status indicator - shell variable unset with config enabled' '
488
- printf " (master)" >expected &&
488
+ printf " (main)" >expected &&
489
test_config bash.showUntrackedFiles true &&
490
(
491
sane_unset GIT_PS1_SHOWUNTRACKEDFILES &&
@@ -495,7 +495,7 @@ test_expect_success 'prompt - untracked files status indicator - shell variable
495
'
496
497
test_expect_success 'prompt - untracked files status indicator - shell variable set with config disabled' '
498
- printf " (master)" >expected &&
498
+ printf " (main)" >expected &&
499
test_config bash.showUntrackedFiles false &&
500
(
501
GIT_PS1_SHOWUNTRACKEDFILES=y &&
@@ -505,7 +505,7 @@ test_expect_success 'prompt - untracked files status indicator - shell variable
505
'
506
507
test_expect_success 'prompt - untracked files status indicator - shell variable set with config enabled' '
508
- printf " (master %%)" >expected &&
508
+ printf " (main %%)" >expected &&
509
test_config bash.showUntrackedFiles true &&
510
(
511
GIT_PS1_SHOWUNTRACKEDFILES=y &&
@@ -525,13 +525,13 @@ test_expect_success 'prompt - untracked files status indicator - not shown insid
525
'
526
527
test_expect_success 'prompt - format string starting with dash' '
528
- printf -- "-master" >expected &&
528
+ printf -- "-main" >expected &&
529
__git_ps1 "-%s" >"$actual" &&
530
test_cmp expected "$actual"
531
'
532
533
test_expect_success 'prompt - pc mode' '
534
- printf "BEFORE: (\${__git_ps1_branch_name}):AFTER\\nmaster" >expected &&
534
+ printf "BEFORE: (\${__git_ps1_branch_name}):AFTER\\nmain" >expected &&
535
(
536
__git_ps1 "BEFORE:" ":AFTER" >"$actual" &&
537
test_must_be_empty "$actual" &&
@@ -541,7 +541,7 @@ test_expect_success 'prompt - pc mode' '
541
'
542
543
test_expect_success 'prompt - bash color pc mode - branch name' '
544
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear}):AFTER\\nmaster" >expected &&
544
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear}):AFTER\\nmain" >expected &&
545
(
546
GIT_PS1_SHOWCOLORHINTS=y &&
547
__git_ps1 "BEFORE:" ":AFTER" >"$actual" &&
@@ -553,7 +553,7 @@ test_expect_success 'prompt - bash color pc mode - branch name' '
553
test_expect_success 'prompt - bash color pc mode - detached head' '
554
printf "BEFORE: (${c_red}\${__git_ps1_branch_name}${c_clear}):AFTER\\n(%s...)" $(git log -1 --format="%h" b1^) >expected &&
555
git checkout b1^ &&
556
- test_when_finished "git checkout master" &&
556
+ test_when_finished "git checkout main" &&
557
(
558
GIT_PS1_SHOWCOLORHINTS=y &&
559
__git_ps1 "BEFORE:" ":AFTER" &&
@@ -563,7 +563,7 @@ test_expect_success 'prompt - bash color pc mode - detached head' '
563
'
564
565
test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty worktree' '
566
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_clear}):AFTER\\nmaster" >expected &&
566
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_clear}):AFTER\\nmain" >expected &&
567
echo "dirty" >file &&
568
test_when_finished "git reset --hard" &&
569
(
@@ -576,7 +576,7 @@ test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirt
576
'
577
578
test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index' '
579
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}+${c_clear}):AFTER\\nmaster" >expected &&
579
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}+${c_clear}):AFTER\\nmain" >expected &&
580
echo "dirty" >file &&
581
test_when_finished "git reset --hard" &&
582
git add -u &&
@@ -590,7 +590,7 @@ test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirt
590
'
591
592
test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index and worktree' '
593
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_green}+${c_clear}):AFTER\\nmaster" >expected &&
593
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_green}+${c_clear}):AFTER\\nmain" >expected &&
594
echo "dirty index" >file &&
595
test_when_finished "git reset --hard" &&
596
git add -u &&
@@ -605,7 +605,7 @@ test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirt
605
'
606
607
test_expect_success 'prompt - bash color pc mode - dirty status indicator - before root commit' '
608
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}#${c_clear}):AFTER\\nmaster" >expected &&
608
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}#${c_clear}):AFTER\\nmain" >expected &&
609
(
610
GIT_PS1_SHOWDIRTYSTATE=y &&
611
GIT_PS1_SHOWCOLORHINTS=y &&
@@ -631,7 +631,7 @@ test_expect_success 'prompt - bash color pc mode - inside .git directory' '
631
'
632
633
test_expect_success 'prompt - bash color pc mode - stash status indicator' '
634
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_lblue}\$${c_clear}):AFTER\\nmaster" >expected &&
634
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_lblue}\$${c_clear}):AFTER\\nmain" >expected &&
635
echo 2 >file &&
636
git stash &&
637
test_when_finished "git stash drop" &&
@@ -645,7 +645,7 @@ test_expect_success 'prompt - bash color pc mode - stash status indicator' '
645
'
646
647
test_expect_success 'prompt - bash color pc mode - untracked files status indicator' '
648
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}%%${c_clear}):AFTER\\nmaster" >expected &&
648
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}%%${c_clear}):AFTER\\nmain" >expected &&
649
(
650
GIT_PS1_SHOWUNTRACKEDFILES=y &&
651
GIT_PS1_SHOWCOLORHINTS=y &&
@@ -656,7 +656,7 @@ test_expect_success 'prompt - bash color pc mode - untracked files status indica
656
'
657
658
test_expect_success 'prompt - zsh color pc mode' '
659
- printf "BEFORE: (%%F{green}master%%f):AFTER" >expected &&
659
+ printf "BEFORE: (%%F{green}main%%f):AFTER" >expected &&
660
(
661
ZSH_VERSION=5.0.0 &&
662
GIT_PS1_SHOWCOLORHINTS=y &&
@@ -667,7 +667,7 @@ test_expect_success 'prompt - zsh color pc mode' '
667
'
668
669
test_expect_success 'prompt - hide if pwd ignored - env var unset, config disabled' '
670
- printf " (master)" >expected &&
670
+ printf " (main)" >expected &&
671
test_config bash.hideIfPwdIgnored false &&
672
(
673
cd ignored_dir &&
@@ -688,7 +688,7 @@ test_expect_success 'prompt - hide if pwd ignored - env var unset, config disabl
688
'
689
690
test_expect_success 'prompt - hide if pwd ignored - env var unset, config unset' '
691
- printf " (master)" >expected &&
691
+ printf " (main)" >expected &&
692
(
693
cd ignored_dir &&
694
__git_ps1 >"$actual"
@@ -707,7 +707,7 @@ test_expect_success 'prompt - hide if pwd ignored - env var unset, config unset,
707
'
708
709
test_expect_success 'prompt - hide if pwd ignored - env var set, config disabled' '
710
- printf " (master)" >expected &&
710
+ printf " (main)" >expected &&
711
test_config bash.hideIfPwdIgnored false &&
712
(
713
cd ignored_dir &&