freshlybakedca.ke
Git fork
Merge branch 'pw/3.0-default-initial-branch-to-main'
Declare that "git init" that is not otherwise configured uses
'main' as the initial branch, not 'master', starting Git 3.0.
* pw/3.0-default-initial-branch-to-main:
t0613: stop setting default initial branch
t9902: switch default branch name to main
t4013: switch default branch name to main
breaking-changes: switch default branch to main
+6
Documentation/BreakingChanges.adoc
+6
Documentation/BreakingChanges.adoc
···
165
"reftable" format. Most importantly, alternative implementations of Git like
166
JGit, libgit2 and Gitoxide need to support it.
167
168
+
* In new repositories, the default branch name will be `main`. We have been
169
+
warning that the default name will change since 675704c74dd (init:
170
+
provide useful advice about init.defaultBranch, 2020-12-11). The new name
171
+
matches the default branch name used in new repositories by many of the
172
+
big Git forges.
173
+
174
=== Removals
175
176
* Support for grafting commits has long been superseded by git-replace(1).
+9
-3
Documentation/git-init.adoc
+9
-3
Documentation/git-init.adoc
···
77
`-b <branch-name>`::
78
`--initial-branch=<branch-name>`::
79
Use _<branch-name>_ for the initial branch in the newly created
80
-
repository. If not specified, fall back to the default name (currently
81
-
`master`, but this is subject to change in the future; the name can be
82
-
customized via the `init.defaultBranch` configuration variable).
83
84
`--shared[=(false|true|umask|group|all|world|everybody|<perm>)]`::
85
···
77
`-b <branch-name>`::
78
`--initial-branch=<branch-name>`::
79
Use _<branch-name>_ for the initial branch in the newly created
80
+
repository. If not specified, fall back to the default name
81
+
ifndef::with-breaking-changes[]
82
+
(currently `master`, but this will change to `main` when Git 3.0 is released).
83
+
endif::with-breaking-changes[]
84
+
ifdef::with-breaking-changes[]
85
+
`main`.
86
+
endif::with-breaking-changes[]
87
+
The default name can be customized via the `init.defaultBranch` configuration
88
+
variable.
89
90
`--shared[=(false|true|umask|group|all|world|everybody|<perm>)]`::
91
+2
advice.c
+2
advice.c
···
51
[ADVICE_AM_WORK_DIR] = { "amWorkDir" },
52
[ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = { "checkoutAmbiguousRemoteBranchName" },
53
[ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge" },
54
[ADVICE_DEFAULT_BRANCH_NAME] = { "defaultBranchName" },
55
[ADVICE_DETACHED_HEAD] = { "detachedHead" },
56
[ADVICE_DIVERGING] = { "diverging" },
57
[ADVICE_FETCH_SET_HEAD_WARN] = { "fetchRemoteHEADWarn" },
···
51
[ADVICE_AM_WORK_DIR] = { "amWorkDir" },
52
[ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = { "checkoutAmbiguousRemoteBranchName" },
53
[ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge" },
54
+
#ifndef WITH_BREAKING_CHANGES
55
[ADVICE_DEFAULT_BRANCH_NAME] = { "defaultBranchName" },
56
+
#endif /* WITH_BREAKING_CHANGES */
57
[ADVICE_DETACHED_HEAD] = { "detachedHead" },
58
[ADVICE_DIVERGING] = { "diverging" },
59
[ADVICE_FETCH_SET_HEAD_WARN] = { "fetchRemoteHEADWarn" },
+2
advice.h
+2
advice.h
-1
ci/run-build-and-tests.sh
-1
ci/run-build-and-tests.sh
+11
-4
refs.c
+11
-4
refs.c
···
627
strvec_pushf(prefixes, *p, len, prefix);
628
}
629
630
static const char default_branch_name_advice[] = N_(
631
"Using '%s' as the name for the initial branch. This default branch name\n"
632
-
"is subject to change. To configure the initial branch name to use in all\n"
633
-
"of your new repositories, which will suppress this warning, call:\n"
634
"\n"
635
"\tgit config --global init.defaultBranch <name>\n"
636
"\n"
···
639
"\n"
640
"\tgit branch -m <name>\n"
641
);
642
643
-
char *repo_default_branch_name(struct repository *r, int quiet)
644
{
645
const char *config_key = "init.defaultbranch";
646
const char *config_display_key = "init.defaultBranch";
···
649
650
if (env && *env)
651
ret = xstrdup(env);
652
-
else if (repo_config_get_string(r, config_key, &ret) < 0)
653
die(_("could not retrieve `%s`"), config_display_key);
654
655
if (!ret) {
656
ret = xstrdup("master");
657
if (!quiet)
658
advise_if_enabled(ADVICE_DEFAULT_BRANCH_NAME,
659
_(default_branch_name_advice), ret);
660
}
661
662
full_ref = xstrfmt("refs/heads/%s", ret);
···
627
strvec_pushf(prefixes, *p, len, prefix);
628
}
629
630
+
#ifndef WITH_BREAKING_CHANGES
631
static const char default_branch_name_advice[] = N_(
632
"Using '%s' as the name for the initial branch. This default branch name\n"
633
+
"will change to \"main\" in Git 3.0. To configure the initial branch name\n"
634
+
"to use in all of your new repositories, which will suppress this warning,\n"
635
+
"call:\n"
636
"\n"
637
"\tgit config --global init.defaultBranch <name>\n"
638
"\n"
···
641
"\n"
642
"\tgit branch -m <name>\n"
643
);
644
+
#endif /* WITH_BREAKING_CHANGES */
645
646
+
char *repo_default_branch_name(struct repository *r, MAYBE_UNUSED int quiet)
647
{
648
const char *config_key = "init.defaultbranch";
649
const char *config_display_key = "init.defaultBranch";
···
652
653
if (env && *env)
654
ret = xstrdup(env);
655
+
if (!ret && repo_config_get_string(r, config_key, &ret) < 0)
656
die(_("could not retrieve `%s`"), config_display_key);
657
658
if (!ret) {
659
+
#ifdef WITH_BREAKING_CHANGES
660
+
ret = xstrdup("main");
661
+
#else
662
ret = xstrdup("master");
663
if (!quiet)
664
advise_if_enabled(ADVICE_DEFAULT_BRANCH_NAME,
665
_(default_branch_name_advice), ret);
666
+
#endif /* WITH_BREAKING_CHANGES */
667
}
668
669
full_ref = xstrfmt("refs/heads/%s", ret);
+17
-1
t/t0001-init.sh
+17
-1
t/t0001-init.sh
···
868
grep nmb actual
869
'
870
871
-
test_expect_success 'advice on unconfigured init.defaultBranch' '
872
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= git -c color.advice=always \
873
init unconfigured-default-branch-name 2>err &&
874
test_decode_color <err >decoded &&
···
881
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
882
git -c advice.defaultBranchName=false init no-advice 2>err &&
883
test_grep ! "hint: " err
884
'
885
886
test_expect_success 'overridden default main branch name (env)' '
···
868
grep nmb actual
869
'
870
871
+
test_expect_success !WITH_BREAKING_CHANGES 'advice on unconfigured init.defaultBranch' '
872
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= git -c color.advice=always \
873
init unconfigured-default-branch-name 2>err &&
874
test_decode_color <err >decoded &&
···
881
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
882
git -c advice.defaultBranchName=false init no-advice 2>err &&
883
test_grep ! "hint: " err
884
+
'
885
+
886
+
test_expect_success 'default branch name' '
887
+
if test_have_prereq WITH_BREAKING_CHANGES
888
+
then
889
+
expect=main
890
+
else
891
+
expect=master
892
+
fi &&
893
+
echo "refs/heads/$expect" >expect &&
894
+
(
895
+
sane_unset GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME &&
896
+
git init default-initial-branch-name
897
+
) &&
898
+
git -C default-initial-branch-name symbolic-ref HEAD >actual &&
899
+
test_cmp expect actual
900
'
901
902
test_expect_success 'overridden default main branch name (env)' '
+13
-11
t/t0613-reftable-write-options.sh
+13
-11
t/t0613-reftable-write-options.sh
···
11
# Block sizes depend on the hash function, so we force SHA1 here.
12
GIT_TEST_DEFAULT_HASH=sha1
13
export GIT_TEST_DEFAULT_HASH
14
-
# Block sizes also depend on the actual refs we write, so we force "master" to
15
-
# be the default initial branch name.
16
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
17
-
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
18
19
. ./test-lib.sh
20
21
test_expect_success 'default write options' '
22
test_when_finished "rm -rf repo" &&
23
-
git init repo &&
24
(
25
cd repo &&
26
test_commit initial &&
···
43
test_expect_success 'disabled reflog writes no log blocks' '
44
test_config_global core.logAllRefUpdates false &&
45
test_when_finished "rm -rf repo" &&
46
-
git init repo &&
47
(
48
cd repo &&
49
test_commit initial &&
···
62
63
test_expect_success 'many refs results in multiple blocks' '
64
test_when_finished "rm -rf repo" &&
65
-
git init repo &&
66
(
67
cd repo &&
68
test_commit initial &&
···
115
test_expect_success 'small block size leads to multiple ref blocks' '
116
test_config_global core.logAllRefUpdates false &&
117
test_when_finished "rm -rf repo" &&
118
-
git init repo &&
119
(
120
cd repo &&
121
test_commit A &&
···
172
173
test_expect_success 'restart interval at every single record' '
174
test_when_finished "rm -rf repo" &&
175
-
git init repo &&
176
(
177
cd repo &&
178
test_commit initial &&
···
212
test_expect_success 'object index gets written by default with ref index' '
213
test_config_global core.logAllRefUpdates false &&
214
test_when_finished "rm -rf repo" &&
215
-
git init repo &&
216
(
217
cd repo &&
218
test_commit initial &&
···
247
test_expect_success 'object index can be disabled' '
248
test_config_global core.logAllRefUpdates false &&
249
test_when_finished "rm -rf repo" &&
250
-
git init repo &&
251
(
252
cd repo &&
253
test_commit initial &&
···
11
# Block sizes depend on the hash function, so we force SHA1 here.
12
GIT_TEST_DEFAULT_HASH=sha1
13
export GIT_TEST_DEFAULT_HASH
14
15
. ./test-lib.sh
16
17
+
# Block sizes depend on the actual refs we write, so, for tests
18
+
# that check block size, we force the initial branch name to be "master".
19
+
init_repo () {
20
+
git init --initial-branch master repo
21
+
}
22
+
23
test_expect_success 'default write options' '
24
test_when_finished "rm -rf repo" &&
25
+
init_repo &&
26
(
27
cd repo &&
28
test_commit initial &&
···
45
test_expect_success 'disabled reflog writes no log blocks' '
46
test_config_global core.logAllRefUpdates false &&
47
test_when_finished "rm -rf repo" &&
48
+
init_repo &&
49
(
50
cd repo &&
51
test_commit initial &&
···
64
65
test_expect_success 'many refs results in multiple blocks' '
66
test_when_finished "rm -rf repo" &&
67
+
init_repo &&
68
(
69
cd repo &&
70
test_commit initial &&
···
117
test_expect_success 'small block size leads to multiple ref blocks' '
118
test_config_global core.logAllRefUpdates false &&
119
test_when_finished "rm -rf repo" &&
120
+
init_repo &&
121
(
122
cd repo &&
123
test_commit A &&
···
174
175
test_expect_success 'restart interval at every single record' '
176
test_when_finished "rm -rf repo" &&
177
+
init_repo &&
178
(
179
cd repo &&
180
test_commit initial &&
···
214
test_expect_success 'object index gets written by default with ref index' '
215
test_config_global core.logAllRefUpdates false &&
216
test_when_finished "rm -rf repo" &&
217
+
init_repo &&
218
(
219
cd repo &&
220
test_commit initial &&
···
249
test_expect_success 'object index can be disabled' '
250
test_config_global core.logAllRefUpdates false &&
251
test_when_finished "rm -rf repo" &&
252
+
init_repo &&
253
(
254
cd repo &&
255
test_commit initial &&
+110
-110
t/t4013-diff-various.sh
+110
-110
t/t4013-diff-various.sh
···
5
6
test_description='Various diff formatting options'
7
8
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
9
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
11
. ./test-lib.sh
···
70
GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
71
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
72
73
-
git checkout master &&
74
git pull -s ours --no-rebase . side &&
75
76
GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
···
95
test_write_lines B A >dir/sub &&
96
git add dir/sub &&
97
git commit -m "Rearranged lines in dir/sub" &&
98
-
git checkout master &&
99
100
GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
101
GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
···
103
git checkout -b mode initial &&
104
git update-index --chmod=+x file0 &&
105
git commit -m "update mode" &&
106
-
git checkout -f master &&
107
108
GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
109
GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
···
112
git update-index --chmod=+x file2 &&
113
git commit -m "update mode (file2)" &&
114
git notes add -m "note" &&
115
-
git checkout -f master &&
116
117
-
# Same merge as master, but with parents reversed. Hide it in a
118
# pseudo-ref to avoid impacting tests with --all.
119
commit=$(echo reverse |
120
-
git commit-tree -p master^2 -p master^1 master^{tree}) &&
121
git update-ref REVERSE $commit &&
122
123
git config diff.renames false &&
···
127
128
: <<\EOF
129
! [initial] Initial
130
-
* [master] Merge branch 'side'
131
! [rearrange] Rearranged lines in dir/sub
132
! [side] Side
133
----
134
+ [rearrange] Rearranged lines in dir/sub
135
-
- [master] Merge branch 'side'
136
* + [side] Side
137
-
* [master^] Third
138
-
* [master~2] Second
139
+*++ [initial] Initial
140
EOF
141
···
311
diff-tree --stat initial mode
312
diff-tree --summary initial mode
313
314
-
diff-tree master
315
-
diff-tree -m master
316
-
diff-tree -p master
317
-
diff-tree -p -m master
318
-
diff-tree -c master
319
-
diff-tree -c --abbrev master
320
-
:noellipses diff-tree -c --abbrev master
321
-
diff-tree --cc master
322
# stat only should show the diffstat with the first parent
323
-
diff-tree -c --stat master
324
-
diff-tree --cc --stat master
325
-
diff-tree -c --stat --summary master
326
-
diff-tree --cc --stat --summary master
327
# stat summary should show the diffstat and summary with the first parent
328
diff-tree -c --stat --summary side
329
diff-tree --cc --stat --summary side
330
-
diff-tree --cc --shortstat master
331
diff-tree --cc --summary REVERSE
332
# improved by Timo's patch
333
-
diff-tree --cc --patch-with-stat master
334
# improved by Timo's patch
335
-
diff-tree --cc --patch-with-stat --summary master
336
# this is correct
337
diff-tree --cc --patch-with-stat --summary side
338
339
-
log master
340
-
log -p master
341
-
log --root master
342
-
log --root -p master
343
-
log --patch-with-stat master
344
-
log --root --patch-with-stat master
345
-
log --root --patch-with-stat --summary master
346
# improved by Timo's patch
347
-
log --root -c --patch-with-stat --summary master
348
# improved by Timo's patch
349
-
log --root --cc --patch-with-stat --summary master
350
-
log --no-diff-merges -p --first-parent master
351
-
log --diff-merges=off -p --first-parent master
352
-
log --first-parent --diff-merges=off -p master
353
-
log -p --first-parent master
354
-
log -p --diff-merges=first-parent master
355
-
log --diff-merges=first-parent master
356
-
log -m -p --first-parent master
357
-
log -m -p master
358
-
log --cc -m -p master
359
-
log -c -m -p master
360
-
log -m --raw master
361
-
log -m --stat master
362
-
log -SF master
363
-
log -S F master
364
-
log -SF -p master
365
-
log -SF master --max-count=0
366
-
log -SF master --max-count=1
367
-
log -SF master --max-count=2
368
-
log -GF master
369
-
log -GF -p master
370
-
log -GF -p --pickaxe-all master
371
-
log -IA -IB -I1 -I2 -p master
372
log --decorate --all
373
log --decorate=full --all
374
log --decorate --clear-decorations --all
···
377
rev-list --parents HEAD
378
rev-list --children HEAD
379
380
-
whatchanged master
381
-
:noellipses whatchanged master
382
-
whatchanged -p master
383
-
whatchanged --root master
384
-
:noellipses whatchanged --root master
385
-
whatchanged --root -p master
386
-
whatchanged --patch-with-stat master
387
-
whatchanged --root --patch-with-stat master
388
-
whatchanged --root --patch-with-stat --summary master
389
# improved by Timo's patch
390
-
whatchanged --root -c --patch-with-stat --summary master
391
# improved by Timo's patch
392
-
whatchanged --root --cc --patch-with-stat --summary master
393
-
whatchanged -SF master
394
-
:noellipses whatchanged -SF master
395
-
whatchanged -SF -p master
396
397
-
log --patch-with-stat master -- dir/
398
-
whatchanged --patch-with-stat master -- dir/
399
-
log --patch-with-stat --summary master -- dir/
400
-
whatchanged --patch-with-stat --summary master -- dir/
401
402
show initial
403
show --root initial
404
show side
405
-
show master
406
-
show -c master
407
-
show -m master
408
-
show --first-parent master
409
show --stat side
410
show --stat --summary side
411
show --patch-with-stat side
···
414
show --patch-with-stat --summary side
415
416
format-patch --stdout initial..side
417
-
format-patch --stdout initial..master^
418
-
format-patch --stdout initial..master
419
-
format-patch --stdout --no-numbered initial..master
420
-
format-patch --stdout --numbered initial..master
421
format-patch --attach --stdout initial..side
422
format-patch --attach --stdout --suffix=.diff initial..side
423
-
format-patch --attach --stdout initial..master^
424
-
format-patch --attach --stdout initial..master
425
format-patch --inline --stdout initial..side
426
-
format-patch --inline --stdout initial..master^
427
-
format-patch --inline --stdout --numbered-files initial..master
428
-
format-patch --inline --stdout initial..master
429
-
format-patch --inline --stdout --subject-prefix=TESTCASE initial..master
430
config format.subjectprefix DIFFERENT_PREFIX
431
-
format-patch --inline --stdout initial..master^^
432
-
format-patch --stdout --cover-letter -n initial..master^
433
434
diff --abbrev initial..side
435
diff -U initial..side
···
448
diff --no-index --name-status dir2 dir
449
diff --no-index --name-status -- dir2 dir
450
diff --no-index dir dir3
451
-
diff master master^ side
452
# Can't use spaces...
453
-
diff --line-prefix=abc master master^ side
454
-
diff --dirstat master~1 master~2
455
diff --dirstat initial rearrange
456
diff --dirstat-by-file initial rearrange
457
-
diff --dirstat --cc master~1 master
458
# No-index --abbrev and --no-abbrev
459
diff --raw initial
460
:noellipses diff --raw initial
···
482
'
483
484
test_expect_success 'log -m matches pure log' '
485
-
git log master >result &&
486
process_diffs result >expected &&
487
git log -m >result &&
488
process_diffs result >actual &&
···
490
'
491
492
test_expect_success 'log --diff-merges=on matches --diff-merges=separate' '
493
-
git log -p --diff-merges=separate master >result &&
494
process_diffs result >expected &&
495
-
git log -p --diff-merges=on master >result &&
496
process_diffs result >actual &&
497
test_cmp expected actual
498
'
499
500
test_expect_success 'log --dd matches --diff-merges=1 -p' '
501
-
git log --diff-merges=1 -p master >result &&
502
process_diffs result >expected &&
503
-
git log --dd master >result &&
504
process_diffs result >actual &&
505
test_cmp expected actual
506
'
···
511
'
512
513
test_expect_success 'git config log.diffMerges first-parent' '
514
-
git log -p --diff-merges=first-parent master >result &&
515
process_diffs result >expected &&
516
test_config log.diffMerges first-parent &&
517
-
git log -p --diff-merges=on master >result &&
518
process_diffs result >actual &&
519
test_cmp expected actual
520
'
521
522
test_expect_success 'git config log.diffMerges first-parent vs -m' '
523
-
git log -p --diff-merges=first-parent master >result &&
524
process_diffs result >expected &&
525
test_config log.diffMerges first-parent &&
526
-
git log -p -m master >result &&
527
process_diffs result >actual &&
528
test_cmp expected actual
529
'
···
572
Third
573
Second
574
EOF
575
-
git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
576
test_cmp expect actual
577
'
578
···
585
586
dir/sub
587
EOF
588
-
git rev-list master^ |
589
git diff-tree -r --stdin --name-only --format=%s dir >actual &&
590
test_cmp expect actual
591
'
592
593
test_expect_success 'show A B ... -- <pathspec>' '
594
# side touches dir/sub, file0, and file3
595
-
# master^ touches dir/sub, and file1
596
-
# master^^ touches dir/sub, file0, and file2
597
-
git show --name-only --format="<%s>" side master^ master^^ -- dir >actual &&
598
cat >expect <<-\EOF &&
599
<Side>
600
···
610
'
611
612
test_expect_success 'diff -I<regex>: setup' '
613
-
git checkout master &&
614
test_seq 50 >file0 &&
615
git commit -m "Set up -I<regex> test file" file0 &&
616
test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
···
5
6
test_description='Various diff formatting options'
7
8
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
9
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
11
. ./test-lib.sh
···
70
GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
71
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
72
73
+
git checkout main &&
74
git pull -s ours --no-rebase . side &&
75
76
GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
···
95
test_write_lines B A >dir/sub &&
96
git add dir/sub &&
97
git commit -m "Rearranged lines in dir/sub" &&
98
+
git checkout main &&
99
100
GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
101
GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
···
103
git checkout -b mode initial &&
104
git update-index --chmod=+x file0 &&
105
git commit -m "update mode" &&
106
+
git checkout -f main &&
107
108
GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
109
GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
···
112
git update-index --chmod=+x file2 &&
113
git commit -m "update mode (file2)" &&
114
git notes add -m "note" &&
115
+
git checkout -f main &&
116
117
+
# Same merge as main, but with parents reversed. Hide it in a
118
# pseudo-ref to avoid impacting tests with --all.
119
commit=$(echo reverse |
120
+
git commit-tree -p main^2 -p main^1 main^{tree}) &&
121
git update-ref REVERSE $commit &&
122
123
git config diff.renames false &&
···
127
128
: <<\EOF
129
! [initial] Initial
130
+
* [main] Merge branch 'side'
131
! [rearrange] Rearranged lines in dir/sub
132
! [side] Side
133
----
134
+ [rearrange] Rearranged lines in dir/sub
135
+
- [main] Merge branch 'side'
136
* + [side] Side
137
+
* [main^] Third
138
+
* [main~2] Second
139
+*++ [initial] Initial
140
EOF
141
···
311
diff-tree --stat initial mode
312
diff-tree --summary initial mode
313
314
+
diff-tree main
315
+
diff-tree -m main
316
+
diff-tree -p main
317
+
diff-tree -p -m main
318
+
diff-tree -c main
319
+
diff-tree -c --abbrev main
320
+
:noellipses diff-tree -c --abbrev main
321
+
diff-tree --cc main
322
# stat only should show the diffstat with the first parent
323
+
diff-tree -c --stat main
324
+
diff-tree --cc --stat main
325
+
diff-tree -c --stat --summary main
326
+
diff-tree --cc --stat --summary main
327
# stat summary should show the diffstat and summary with the first parent
328
diff-tree -c --stat --summary side
329
diff-tree --cc --stat --summary side
330
+
diff-tree --cc --shortstat main
331
diff-tree --cc --summary REVERSE
332
# improved by Timo's patch
333
+
diff-tree --cc --patch-with-stat main
334
# improved by Timo's patch
335
+
diff-tree --cc --patch-with-stat --summary main
336
# this is correct
337
diff-tree --cc --patch-with-stat --summary side
338
339
+
log main
340
+
log -p main
341
+
log --root main
342
+
log --root -p main
343
+
log --patch-with-stat main
344
+
log --root --patch-with-stat main
345
+
log --root --patch-with-stat --summary main
346
# improved by Timo's patch
347
+
log --root -c --patch-with-stat --summary main
348
# improved by Timo's patch
349
+
log --root --cc --patch-with-stat --summary main
350
+
log --no-diff-merges -p --first-parent main
351
+
log --diff-merges=off -p --first-parent main
352
+
log --first-parent --diff-merges=off -p main
353
+
log -p --first-parent main
354
+
log -p --diff-merges=first-parent main
355
+
log --diff-merges=first-parent main
356
+
log -m -p --first-parent main
357
+
log -m -p main
358
+
log --cc -m -p main
359
+
log -c -m -p main
360
+
log -m --raw main
361
+
log -m --stat main
362
+
log -SF main
363
+
log -S F main
364
+
log -SF -p main
365
+
log -SF main --max-count=0
366
+
log -SF main --max-count=1
367
+
log -SF main --max-count=2
368
+
log -GF main
369
+
log -GF -p main
370
+
log -GF -p --pickaxe-all main
371
+
log -IA -IB -I1 -I2 -p main
372
log --decorate --all
373
log --decorate=full --all
374
log --decorate --clear-decorations --all
···
377
rev-list --parents HEAD
378
rev-list --children HEAD
379
380
+
whatchanged main
381
+
:noellipses whatchanged main
382
+
whatchanged -p main
383
+
whatchanged --root main
384
+
:noellipses whatchanged --root main
385
+
whatchanged --root -p main
386
+
whatchanged --patch-with-stat main
387
+
whatchanged --root --patch-with-stat main
388
+
whatchanged --root --patch-with-stat --summary main
389
# improved by Timo's patch
390
+
whatchanged --root -c --patch-with-stat --summary main
391
# improved by Timo's patch
392
+
whatchanged --root --cc --patch-with-stat --summary main
393
+
whatchanged -SF main
394
+
:noellipses whatchanged -SF main
395
+
whatchanged -SF -p main
396
397
+
log --patch-with-stat main -- dir/
398
+
whatchanged --patch-with-stat main -- dir/
399
+
log --patch-with-stat --summary main -- dir/
400
+
whatchanged --patch-with-stat --summary main -- dir/
401
402
show initial
403
show --root initial
404
show side
405
+
show main
406
+
show -c main
407
+
show -m main
408
+
show --first-parent main
409
show --stat side
410
show --stat --summary side
411
show --patch-with-stat side
···
414
show --patch-with-stat --summary side
415
416
format-patch --stdout initial..side
417
+
format-patch --stdout initial..main^
418
+
format-patch --stdout initial..main
419
+
format-patch --stdout --no-numbered initial..main
420
+
format-patch --stdout --numbered initial..main
421
format-patch --attach --stdout initial..side
422
format-patch --attach --stdout --suffix=.diff initial..side
423
+
format-patch --attach --stdout initial..main^
424
+
format-patch --attach --stdout initial..main
425
format-patch --inline --stdout initial..side
426
+
format-patch --inline --stdout initial..main^
427
+
format-patch --inline --stdout --numbered-files initial..main
428
+
format-patch --inline --stdout initial..main
429
+
format-patch --inline --stdout --subject-prefix=TESTCASE initial..main
430
config format.subjectprefix DIFFERENT_PREFIX
431
+
format-patch --inline --stdout initial..main^^
432
+
format-patch --stdout --cover-letter -n initial..main^
433
434
diff --abbrev initial..side
435
diff -U initial..side
···
448
diff --no-index --name-status dir2 dir
449
diff --no-index --name-status -- dir2 dir
450
diff --no-index dir dir3
451
+
diff main main^ side
452
# Can't use spaces...
453
+
diff --line-prefix=abc main main^ side
454
+
diff --dirstat main~1 main~2
455
diff --dirstat initial rearrange
456
diff --dirstat-by-file initial rearrange
457
+
diff --dirstat --cc main~1 main
458
# No-index --abbrev and --no-abbrev
459
diff --raw initial
460
:noellipses diff --raw initial
···
482
'
483
484
test_expect_success 'log -m matches pure log' '
485
+
git log main >result &&
486
process_diffs result >expected &&
487
git log -m >result &&
488
process_diffs result >actual &&
···
490
'
491
492
test_expect_success 'log --diff-merges=on matches --diff-merges=separate' '
493
+
git log -p --diff-merges=separate main >result &&
494
process_diffs result >expected &&
495
+
git log -p --diff-merges=on main >result &&
496
process_diffs result >actual &&
497
test_cmp expected actual
498
'
499
500
test_expect_success 'log --dd matches --diff-merges=1 -p' '
501
+
git log --diff-merges=1 -p main >result &&
502
process_diffs result >expected &&
503
+
git log --dd main >result &&
504
process_diffs result >actual &&
505
test_cmp expected actual
506
'
···
511
'
512
513
test_expect_success 'git config log.diffMerges first-parent' '
514
+
git log -p --diff-merges=first-parent main >result &&
515
process_diffs result >expected &&
516
test_config log.diffMerges first-parent &&
517
+
git log -p --diff-merges=on main >result &&
518
process_diffs result >actual &&
519
test_cmp expected actual
520
'
521
522
test_expect_success 'git config log.diffMerges first-parent vs -m' '
523
+
git log -p --diff-merges=first-parent main >result &&
524
process_diffs result >expected &&
525
test_config log.diffMerges first-parent &&
526
+
git log -p -m main >result &&
527
process_diffs result >actual &&
528
test_cmp expected actual
529
'
···
572
Third
573
Second
574
EOF
575
+
git rev-list main | git diff-tree --stdin --format=%s -s >actual &&
576
test_cmp expect actual
577
'
578
···
585
586
dir/sub
587
EOF
588
+
git rev-list main^ |
589
git diff-tree -r --stdin --name-only --format=%s dir >actual &&
590
test_cmp expect actual
591
'
592
593
test_expect_success 'show A B ... -- <pathspec>' '
594
# side touches dir/sub, file0, and file3
595
+
# main^ touches dir/sub, and file1
596
+
# main^^ touches dir/sub, file0, and file2
597
+
git show --name-only --format="<%s>" side main^ main^^ -- dir >actual &&
598
cat >expect <<-\EOF &&
599
<Side>
600
···
610
'
611
612
test_expect_success 'diff -I<regex>: setup' '
613
+
git checkout main &&
614
test_seq 50 >file0 &&
615
git commit -m "Set up -I<regex> test file" file0 &&
616
test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
+1
-1
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
t/t4013/diff.diff-tree_--cc_--patch-with-stat_main
+1
-1
t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
t/t4013/diff.diff-tree_--cc_--patch-with-stat_main
+1
-1
t/t4013/diff.diff-tree_--cc_--shortstat_master
t/t4013/diff.diff-tree_--cc_--shortstat_main
+1
-1
t/t4013/diff.diff-tree_--cc_--shortstat_master
t/t4013/diff.diff-tree_--cc_--shortstat_main
+1
-1
t/t4013/diff.diff-tree_--cc_--stat_--summary_master
t/t4013/diff.diff-tree_-c_--stat_--summary_main
+1
-1
t/t4013/diff.diff-tree_--cc_--stat_--summary_master
t/t4013/diff.diff-tree_-c_--stat_--summary_main
+1
-1
t/t4013/diff.diff-tree_--cc_--stat_master
t/t4013/diff.diff-tree_-c_--stat_main
+1
-1
t/t4013/diff.diff-tree_--cc_--stat_master
t/t4013/diff.diff-tree_-c_--stat_main
+1
-1
t/t4013/diff.diff-tree_--cc_master
t/t4013/diff.diff-tree_--cc_main
+1
-1
t/t4013/diff.diff-tree_--cc_master
t/t4013/diff.diff-tree_--cc_main
+1
-1
t/t4013/diff.diff-tree_-c_--abbrev_master
t/t4013/diff.diff-tree_-c_--abbrev_main
+1
-1
t/t4013/diff.diff-tree_-c_--abbrev_master
t/t4013/diff.diff-tree_-c_--abbrev_main
+1
-1
t/t4013/diff.diff-tree_-c_--stat_--summary_master
t/t4013/diff.diff-tree_--cc_--stat_--summary_main
+1
-1
t/t4013/diff.diff-tree_-c_--stat_--summary_master
t/t4013/diff.diff-tree_--cc_--stat_--summary_main
+1
-1
t/t4013/diff.diff-tree_-c_--stat_master
t/t4013/diff.diff-tree_--cc_--stat_main
+1
-1
t/t4013/diff.diff-tree_-c_--stat_master
t/t4013/diff.diff-tree_--cc_--stat_main
+1
-1
t/t4013/diff.diff-tree_-c_master
t/t4013/diff.diff-tree_-c_main
+1
-1
t/t4013/diff.diff-tree_-c_master
t/t4013/diff.diff-tree_-c_main
···
1
-
$ git diff-tree -c master
2
59d314ad6f356dd08601a4cd5e530381da3e3c64
3
::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM dir/sub
4
::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM file0
···
1
+
$ git diff-tree -c main
2
59d314ad6f356dd08601a4cd5e530381da3e3c64
3
::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM dir/sub
4
::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM file0
+1
-1
t/t4013/diff.diff-tree_-m_master
t/t4013/diff.diff-tree_-m_main
+1
-1
t/t4013/diff.diff-tree_-m_master
t/t4013/diff.diff-tree_-m_main
+1
-1
t/t4013/diff.diff-tree_-p_-m_master
t/t4013/diff.diff-tree_-p_-m_main
+1
-1
t/t4013/diff.diff-tree_-p_-m_master
t/t4013/diff.diff-tree_-p_-m_main
+3
t/t4013/diff.diff_--dirstat_--cc_main~1_main
+3
t/t4013/diff.diff_--dirstat_--cc_main~1_main
-3
t/t4013/diff.diff_--dirstat_--cc_master~1_master
-3
t/t4013/diff.diff_--dirstat_--cc_master~1_master
+3
t/t4013/diff.diff_--dirstat_main~1_main~2
+3
t/t4013/diff.diff_--dirstat_main~1_main~2
-3
t/t4013/diff.diff_--dirstat_master~1_master~2
-3
t/t4013/diff.diff_--dirstat_master~1_master~2
+1
-1
t/t4013/diff.diff_--line-prefix=abc_master_master^_side
t/t4013/diff.diff_--line-prefix=abc_main_main^_side
+1
-1
t/t4013/diff.diff_--line-prefix=abc_master_master^_side
t/t4013/diff.diff_--line-prefix=abc_main_main^_side
+1
-1
t/t4013/diff.diff_master_master^_side
t/t4013/diff.diff_main_main^_side
+1
-1
t/t4013/diff.diff_master_master^_side
t/t4013/diff.diff_main_main^_side
+1
-1
t/t4013/diff.format-patch_--attach_--stdout_initial..master
t/t4013/diff.format-patch_--attach_--stdout_initial..main
+1
-1
t/t4013/diff.format-patch_--attach_--stdout_initial..master
t/t4013/diff.format-patch_--attach_--stdout_initial..main
+1
-1
t/t4013/diff.format-patch_--attach_--stdout_initial..master^
t/t4013/diff.format-patch_--attach_--stdout_initial..main^
+1
-1
t/t4013/diff.format-patch_--attach_--stdout_initial..master^
t/t4013/diff.format-patch_--attach_--stdout_initial..main^
+1
-1
t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..main
+1
-1
t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..main
+1
-1
t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master
t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main
+1
-1
t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master
t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..main
+1
-1
t/t4013/diff.format-patch_--inline_--stdout_initial..master
t/t4013/diff.format-patch_--inline_--stdout_initial..main
+1
-1
t/t4013/diff.format-patch_--inline_--stdout_initial..master
t/t4013/diff.format-patch_--inline_--stdout_initial..main
+1
-1
t/t4013/diff.format-patch_--inline_--stdout_initial..master^
t/t4013/diff.format-patch_--inline_--stdout_initial..main^
+1
-1
t/t4013/diff.format-patch_--inline_--stdout_initial..master^
t/t4013/diff.format-patch_--inline_--stdout_initial..main^
+1
-1
t/t4013/diff.format-patch_--inline_--stdout_initial..master^^
t/t4013/diff.format-patch_--inline_--stdout_initial..main^^
+1
-1
t/t4013/diff.format-patch_--inline_--stdout_initial..master^^
t/t4013/diff.format-patch_--inline_--stdout_initial..main^^
+1
-1
t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..main^
+1
-1
t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..main^
+1
-1
t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master
t/t4013/diff.format-patch_--stdout_--no-numbered_initial..main
+1
-1
t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master
t/t4013/diff.format-patch_--stdout_--no-numbered_initial..main
+1
-1
t/t4013/diff.format-patch_--stdout_--numbered_initial..master
t/t4013/diff.format-patch_--stdout_--numbered_initial..main
+1
-1
t/t4013/diff.format-patch_--stdout_--numbered_initial..master
t/t4013/diff.format-patch_--stdout_--numbered_initial..main
+1
-1
t/t4013/diff.format-patch_--stdout_initial..master
t/t4013/diff.format-patch_--stdout_initial..main
+1
-1
t/t4013/diff.format-patch_--stdout_initial..master
t/t4013/diff.format-patch_--stdout_initial..main
+1
-1
t/t4013/diff.format-patch_--stdout_initial..master^
t/t4013/diff.format-patch_--stdout_initial..main^
+1
-1
t/t4013/diff.format-patch_--stdout_initial..master^
t/t4013/diff.format-patch_--stdout_initial..main^
+1
-1
t/t4013/diff.log_--cc_-m_-p_master
t/t4013/diff.log_-c_-m_-p_main
+1
-1
t/t4013/diff.log_--cc_-m_-p_master
t/t4013/diff.log_-c_-m_-p_main
+1
-1
t/t4013/diff.log_--decorate=full_--all
+1
-1
t/t4013/diff.log_--decorate=full_--all
+1
-1
t/t4013/diff.log_--decorate=full_--clear-decorations_--all
+1
-1
t/t4013/diff.log_--decorate=full_--clear-decorations_--all
+1
-1
t/t4013/diff.log_--decorate=full_--decorate-all_--all
+1
-1
t/t4013/diff.log_--decorate=full_--decorate-all_--all
+1
-1
t/t4013/diff.log_--decorate_--all
+1
-1
t/t4013/diff.log_--decorate_--all
+1
-1
t/t4013/diff.log_--decorate_--clear-decorations_--all
+1
-1
t/t4013/diff.log_--decorate_--clear-decorations_--all
+1
-1
t/t4013/diff.log_--decorate_--decorate-all_--all
+1
-1
t/t4013/diff.log_--decorate_--decorate-all_--all
+1
-1
t/t4013/diff.log_--diff-merges=first-parent_master
t/t4013/diff.log_--diff-merges=first-parent_main
+1
-1
t/t4013/diff.log_--diff-merges=first-parent_master
t/t4013/diff.log_--diff-merges=first-parent_main
+1
-1
t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
t/t4013/diff.log_--no-diff-merges_-p_--first-parent_main
+1
-1
t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
t/t4013/diff.log_--no-diff-merges_-p_--first-parent_main
+1
-1
t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
t/t4013/diff.log_--first-parent_--diff-merges=off_-p_main
+1
-1
t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
t/t4013/diff.log_--first-parent_--diff-merges=off_-p_main
+1
-1
t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master
t/t4013/diff.log_--diff-merges=off_-p_--first-parent_main
+1
-1
t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master
t/t4013/diff.log_--diff-merges=off_-p_--first-parent_main
+1
-1
t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
t/t4013/diff.log_--patch-with-stat_--summary_main_--_dir_
+1
-1
t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
t/t4013/diff.log_--patch-with-stat_--summary_main_--_dir_
+1
-1
t/t4013/diff.log_--patch-with-stat_master
t/t4013/diff.log_--patch-with-stat_main
+1
-1
t/t4013/diff.log_--patch-with-stat_master
t/t4013/diff.log_--patch-with-stat_main
+1
-1
t/t4013/diff.log_--patch-with-stat_master_--_dir_
t/t4013/diff.log_--patch-with-stat_main_--_dir_
+1
-1
t/t4013/diff.log_--patch-with-stat_master_--_dir_
t/t4013/diff.log_--patch-with-stat_main_--_dir_
+1
-1
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.log_--root_--patch-with-stat_--summary_master
t/t4013/diff.log_--root_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.log_--root_--patch-with-stat_--summary_master
t/t4013/diff.log_--root_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.log_--root_--patch-with-stat_master
t/t4013/diff.log_--root_--patch-with-stat_main
+1
-1
t/t4013/diff.log_--root_--patch-with-stat_master
t/t4013/diff.log_--root_--patch-with-stat_main
+1
-1
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.log_--root_-p_master
t/t4013/diff.log_--root_-p_main
+1
-1
t/t4013/diff.log_--root_-p_master
t/t4013/diff.log_--root_-p_main
+1
-1
t/t4013/diff.log_--root_master
t/t4013/diff.log_--root_main
+1
-1
t/t4013/diff.log_--root_master
t/t4013/diff.log_--root_main
+1
-1
t/t4013/diff.log_-GF_-p_--pickaxe-all_master
t/t4013/diff.log_-GF_-p_--pickaxe-all_main
+1
-1
t/t4013/diff.log_-GF_-p_--pickaxe-all_master
t/t4013/diff.log_-GF_-p_--pickaxe-all_main
+1
-1
t/t4013/diff.log_-GF_-p_master
t/t4013/diff.log_-SF_-p_main
+1
-1
t/t4013/diff.log_-GF_-p_master
t/t4013/diff.log_-SF_-p_main
+1
-1
t/t4013/diff.log_-GF_master
t/t4013/diff.log_-SF_main
+1
-1
t/t4013/diff.log_-GF_master
t/t4013/diff.log_-SF_main
+1
-1
t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master
t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_main
+1
-1
t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master
t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_main
+1
-1
t/t4013/diff.log_-SF_-p_master
t/t4013/diff.log_-GF_-p_main
+1
-1
t/t4013/diff.log_-SF_-p_master
t/t4013/diff.log_-GF_-p_main
+1
-1
t/t4013/diff.log_-SF_master
t/t4013/diff.log_-S_F_main
+1
-1
t/t4013/diff.log_-SF_master
t/t4013/diff.log_-S_F_main
+1
-1
t/t4013/diff.log_-SF_master_--max-count=1
t/t4013/diff.log_-SF_main_--max-count=1
+1
-1
t/t4013/diff.log_-SF_master_--max-count=1
t/t4013/diff.log_-SF_main_--max-count=1
+1
-1
t/t4013/diff.log_-SF_master_--max-count=2
t/t4013/diff.log_-SF_main_--max-count=2
+1
-1
t/t4013/diff.log_-SF_master_--max-count=2
t/t4013/diff.log_-SF_main_--max-count=2
+1
-1
t/t4013/diff.log_-S_F_master
t/t4013/diff.log_-GF_main
+1
-1
t/t4013/diff.log_-S_F_master
t/t4013/diff.log_-GF_main
+1
-1
t/t4013/diff.log_-c_-m_-p_master
t/t4013/diff.log_-m_-p_main
+1
-1
t/t4013/diff.log_-c_-m_-p_master
t/t4013/diff.log_-m_-p_main
+1
-1
t/t4013/diff.log_-m_--raw_master
t/t4013/diff.log_-m_--raw_main
+1
-1
t/t4013/diff.log_-m_--raw_master
t/t4013/diff.log_-m_--raw_main
+1
-1
t/t4013/diff.log_-m_--stat_master
t/t4013/diff.log_-m_--stat_main
+1
-1
t/t4013/diff.log_-m_--stat_master
t/t4013/diff.log_-m_--stat_main
+1
-1
t/t4013/diff.log_-m_-p_--first-parent_master
t/t4013/diff.log_-m_-p_--first-parent_main
+1
-1
t/t4013/diff.log_-m_-p_--first-parent_master
t/t4013/diff.log_-m_-p_--first-parent_main
+1
-1
t/t4013/diff.log_-m_-p_master
t/t4013/diff.log_--cc_-m_-p_main
+1
-1
t/t4013/diff.log_-m_-p_master
t/t4013/diff.log_--cc_-m_-p_main
+1
-1
t/t4013/diff.log_-p_--diff-merges=first-parent_master
t/t4013/diff.log_-p_--diff-merges=first-parent_main
+1
-1
t/t4013/diff.log_-p_--diff-merges=first-parent_master
t/t4013/diff.log_-p_--diff-merges=first-parent_main
+1
-1
t/t4013/diff.log_-p_--first-parent_master
t/t4013/diff.log_-p_--first-parent_main
+1
-1
t/t4013/diff.log_-p_--first-parent_master
t/t4013/diff.log_-p_--first-parent_main
+1
-1
t/t4013/diff.log_-p_master
t/t4013/diff.log_-p_main
+1
-1
t/t4013/diff.log_-p_master
t/t4013/diff.log_-p_main
+1
-1
t/t4013/diff.log_master
t/t4013/diff.log_main
+1
-1
t/t4013/diff.log_master
t/t4013/diff.log_main
+1
-1
t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master
t/t4013/diff.noellipses-diff-tree_-c_--abbrev_main
+1
-1
t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master
t/t4013/diff.noellipses-diff-tree_-c_--abbrev_main
+1
-1
t/t4013/diff.noellipses-whatchanged_--root_master
t/t4013/diff.noellipses-whatchanged_--root_main
+1
-1
t/t4013/diff.noellipses-whatchanged_--root_master
t/t4013/diff.noellipses-whatchanged_--root_main
+1
-1
t/t4013/diff.noellipses-whatchanged_-SF_master
t/t4013/diff.noellipses-whatchanged_-SF_main
+1
-1
t/t4013/diff.noellipses-whatchanged_-SF_master
t/t4013/diff.noellipses-whatchanged_-SF_main
+1
-1
t/t4013/diff.noellipses-whatchanged_master
t/t4013/diff.noellipses-whatchanged_main
+1
-1
t/t4013/diff.noellipses-whatchanged_master
t/t4013/diff.noellipses-whatchanged_main
+1
-1
t/t4013/diff.show_--first-parent_master
t/t4013/diff.show_--first-parent_main
+1
-1
t/t4013/diff.show_--first-parent_master
t/t4013/diff.show_--first-parent_main
+1
-1
t/t4013/diff.show_-c_master
t/t4013/diff.show_-c_main
+1
-1
t/t4013/diff.show_-c_master
t/t4013/diff.show_-c_main
+1
-1
t/t4013/diff.show_-m_master
t/t4013/diff.show_-m_main
+1
-1
t/t4013/diff.show_-m_master
t/t4013/diff.show_-m_main
+1
-1
t/t4013/diff.show_master
t/t4013/diff.show_main
+1
-1
t/t4013/diff.show_master
t/t4013/diff.show_main
+1
-1
t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
t/t4013/diff.whatchanged_--patch-with-stat_--summary_main_--_dir_
+1
-1
t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
t/t4013/diff.whatchanged_--patch-with-stat_--summary_main_--_dir_
+1
-1
t/t4013/diff.whatchanged_--patch-with-stat_master
t/t4013/diff.whatchanged_--patch-with-stat_main
+1
-1
t/t4013/diff.whatchanged_--patch-with-stat_master
t/t4013/diff.whatchanged_--patch-with-stat_main
+1
-1
t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
t/t4013/diff.whatchanged_--patch-with-stat_main_--_dir_
+1
-1
t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
t/t4013/diff.whatchanged_--patch-with-stat_main_--_dir_
+1
-1
t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.whatchanged_--root_--patch-with-stat_master
t/t4013/diff.whatchanged_--root_--patch-with-stat_main
+1
-1
t/t4013/diff.whatchanged_--root_--patch-with-stat_master
t/t4013/diff.whatchanged_--root_--patch-with-stat_main
+1
-1
t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_main
+1
-1
t/t4013/diff.whatchanged_--root_-p_master
t/t4013/diff.whatchanged_--root_-p_main
+1
-1
t/t4013/diff.whatchanged_--root_-p_master
t/t4013/diff.whatchanged_--root_-p_main
+1
-1
t/t4013/diff.whatchanged_--root_master
t/t4013/diff.whatchanged_--root_main
+1
-1
t/t4013/diff.whatchanged_--root_master
t/t4013/diff.whatchanged_--root_main
+1
-1
t/t4013/diff.whatchanged_-SF_-p_master
t/t4013/diff.whatchanged_-SF_-p_main
+1
-1
t/t4013/diff.whatchanged_-SF_-p_master
t/t4013/diff.whatchanged_-SF_-p_main
+1
-1
t/t4013/diff.whatchanged_-SF_master
t/t4013/diff.whatchanged_-SF_main
+1
-1
t/t4013/diff.whatchanged_-SF_master
t/t4013/diff.whatchanged_-SF_main
+1
-1
t/t4013/diff.whatchanged_-p_master
t/t4013/diff.whatchanged_-p_main
+1
-1
t/t4013/diff.whatchanged_-p_master
t/t4013/diff.whatchanged_-p_main
+1
-1
t/t4013/diff.whatchanged_master
t/t4013/diff.whatchanged_main
+1
-1
t/t4013/diff.whatchanged_master
t/t4013/diff.whatchanged_main
+3
-3
t/t9902-completion.sh
+3
-3
t/t9902-completion.sh
···
11
# untraceable with such ancient Bash versions.
12
test_untraceable=UnfortunatelyYes
13
14
-
# Override environment and always use master for the default initial branch
15
# name for these tests, so that rev completion candidates are as expected.
16
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
17
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
18
19
. ./lib-bash.sh
···
1453
HEAD Z
1454
final Z
1455
initial Z
1456
-
master Z
1457
EOF
1458
)
1459
'
···
11
# untraceable with such ancient Bash versions.
12
test_untraceable=UnfortunatelyYes
13
14
+
# Override environment and always use main for the default initial branch
15
# name for these tests, so that rev completion candidates are as expected.
16
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
17
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
18
19
. ./lib-bash.sh
···
1453
HEAD Z
1454
final Z
1455
initial Z
1456
+
main Z
1457
EOF
1458
)
1459
'
+7
-4
t/test-lib.sh
+7
-4
t/test-lib.sh
···
127
export GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS
128
fi
129
130
-
# Explicitly set the default branch name for testing, to avoid the
131
-
# transitory "git init" warning under --verbose.
132
-
: ${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME:=master}
133
-
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
134
135
################################################################
136
# It appears that people try to run tests without building...
···
127
export GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS
128
fi
129
130
+
if test -z "$WITH_BREAKING_CHANGES"
131
+
then
132
+
# Explicitly set the default branch name for testing, to avoid the
133
+
# transitory "git init" warning under --verbose.
134
+
: ${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME:=master}
135
+
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
136
+
fi
137
138
################################################################
139
# It appears that people try to run tests without building...