freshlybakedca.ke
Git fork
t9[0-4]*: adjust the references to the default branch name "main"
This trick was performed via
$ (cd t &&
sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
-e 's/Master/Main/g' -- t9[0-4]*.sh)
This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main`
for those tests.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
authored by
Johannes Schindelin
and committed by
Junio C Hamano
a881baa2
747f6c68
+15
-15
t/t9001-send-email.sh
+15
-15
t/t9001-send-email.sh
···
1
#!/bin/sh
2
3
test_description='git send-email'
4
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
5
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
6
7
. ./test-lib.sh
···
1171
'
1172
1173
test_expect_success $PREREQ 'detects ambiguous reference/file conflict' '
1174
-
echo master >master &&
1175
-
git add master &&
1176
-
git commit -m"add master" &&
1177
-
test_must_fail git send-email --dry-run master 2>errors &&
1178
grep disambiguate errors
1179
'
1180
···
1188
outdir/000?-*.patch 2>errors >out &&
1189
grep "^Subject: " out >subjects &&
1190
test "z$(sed -n -e 1p subjects)" = "zSubject: [PATCH 1/2] Second." &&
1191
-
test "z$(sed -n -e 2p subjects)" = "zSubject: [PATCH 2/2] add master"
1192
'
1193
1194
test_expect_success $PREREQ 'in-reply-to but no threading' '
···
2040
--cc="Cc2 <cc2@example.com>" \
2041
--bcc="bcc1@example.com" \
2042
--bcc="bcc2@example.com" \
2043
-
0001-add-master.patch | replace_variable_fields \
2044
>expected-list
2045
'
2046
···
2052
--to="to3@example.com" \
2053
--cc="Cc 1 <cc1@example.com>, Cc2 <cc2@example.com>" \
2054
--bcc="bcc1@example.com, bcc2@example.com" \
2055
-
0001-add-master.patch | replace_variable_fields \
2056
>actual-list &&
2057
test_cmp expected-list actual-list
2058
'
···
2068
--to="To 1 <to1@example.com>, to2, to3@example.com" \
2069
--cc="cc1, Cc2 <cc2@example.com>" \
2070
--bcc="bcc1@example.com, bcc2@example.com" \
2071
-
0001-add-master.patch | replace_variable_fields \
2072
>actual-list &&
2073
test_cmp expected-list actual-list
2074
'
···
2092
--cc="Cc2 <cc2@example.com>" \
2093
--bcc="$BCC1" \
2094
--bcc="bcc2@example.com" \
2095
-
0001-add-master.patch | replace_variable_fields \
2096
>actual-list &&
2097
test_cmp expected-list actual-list
2098
'
···
2111
false
2112
;;
2113
esac &&
2114
-
test -f 0001-add-master.patch &&
2115
-
grep "add master" "$1"
2116
EOF
2117
2118
mkdir subdir &&
···
2124
--from="Example <nobody@example.com>" \
2125
--to=nobody@example.com \
2126
--smtp-server="$(pwd)/../fake.sendmail" \
2127
-
../0001-add-master.patch &&
2128
2129
# Verify error message when a patch is rejected by the hook
2130
-
sed -e "s/add master/x/" ../0001-add-master.patch >../another.patch &&
2131
test_must_fail git send-email \
2132
--from="Example <nobody@example.com>" \
2133
--to=nobody@example.com \
···
2142
--from="Example <nobody@example.com>" \
2143
--to=nobody@example.com \
2144
--smtp-server="$(pwd)/fake.sendmail" \
2145
-
"$(pwd)/0001-add-master.patch"
2146
'
2147
2148
test_expect_success $PREREQ 'test that sendmail config is rejected' '
···
1
#!/bin/sh
2
3
test_description='git send-email'
4
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
5
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
6
7
. ./test-lib.sh
···
1171
'
1172
1173
test_expect_success $PREREQ 'detects ambiguous reference/file conflict' '
1174
+
echo main >main &&
1175
+
git add main &&
1176
+
git commit -m"add main" &&
1177
+
test_must_fail git send-email --dry-run main 2>errors &&
1178
grep disambiguate errors
1179
'
1180
···
1188
outdir/000?-*.patch 2>errors >out &&
1189
grep "^Subject: " out >subjects &&
1190
test "z$(sed -n -e 1p subjects)" = "zSubject: [PATCH 1/2] Second." &&
1191
+
test "z$(sed -n -e 2p subjects)" = "zSubject: [PATCH 2/2] add main"
1192
'
1193
1194
test_expect_success $PREREQ 'in-reply-to but no threading' '
···
2040
--cc="Cc2 <cc2@example.com>" \
2041
--bcc="bcc1@example.com" \
2042
--bcc="bcc2@example.com" \
2043
+
0001-add-main.patch | replace_variable_fields \
2044
>expected-list
2045
'
2046
···
2052
--to="to3@example.com" \
2053
--cc="Cc 1 <cc1@example.com>, Cc2 <cc2@example.com>" \
2054
--bcc="bcc1@example.com, bcc2@example.com" \
2055
+
0001-add-main.patch | replace_variable_fields \
2056
>actual-list &&
2057
test_cmp expected-list actual-list
2058
'
···
2068
--to="To 1 <to1@example.com>, to2, to3@example.com" \
2069
--cc="cc1, Cc2 <cc2@example.com>" \
2070
--bcc="bcc1@example.com, bcc2@example.com" \
2071
+
0001-add-main.patch | replace_variable_fields \
2072
>actual-list &&
2073
test_cmp expected-list actual-list
2074
'
···
2092
--cc="Cc2 <cc2@example.com>" \
2093
--bcc="$BCC1" \
2094
--bcc="bcc2@example.com" \
2095
+
0001-add-main.patch | replace_variable_fields \
2096
>actual-list &&
2097
test_cmp expected-list actual-list
2098
'
···
2111
false
2112
;;
2113
esac &&
2114
+
test -f 0001-add-main.patch &&
2115
+
grep "add main" "$1"
2116
EOF
2117
2118
mkdir subdir &&
···
2124
--from="Example <nobody@example.com>" \
2125
--to=nobody@example.com \
2126
--smtp-server="$(pwd)/../fake.sendmail" \
2127
+
../0001-add-main.patch &&
2128
2129
# Verify error message when a patch is rejected by the hook
2130
+
sed -e "s/add main/x/" ../0001-add-main.patch >../another.patch &&
2131
test_must_fail git send-email \
2132
--from="Example <nobody@example.com>" \
2133
--to=nobody@example.com \
···
2142
--from="Example <nobody@example.com>" \
2143
--to=nobody@example.com \
2144
--smtp-server="$(pwd)/fake.sendmail" \
2145
+
"$(pwd)/0001-add-main.patch"
2146
'
2147
2148
test_expect_success $PREREQ 'test that sendmail config is rejected' '
+2
-2
t/t9100-git-svn-basic.sh
+2
-2
t/t9100-git-svn-basic.sh
···
6
test_description='git svn basic tests'
7
GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
8
9
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
10
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
11
12
. ./lib-git-svn.sh
···
278
test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
279
git log refs/remotes/bar | grep "change 1" &&
280
! git log refs/remotes/bar | grep "change 2" &&
281
-
git checkout master &&
282
git branch -D my-bar
283
'
284
···
6
test_description='git svn basic tests'
7
GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
8
9
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
10
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
11
12
. ./lib-git-svn.sh
···
278
test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
279
git log refs/remotes/bar | grep "change 1" &&
280
! git log refs/remotes/bar | grep "change 2" &&
281
+
git checkout main &&
282
git branch -D my-bar
283
'
284
+4
-4
t/t9145-git-svn-master-branch.sh
+4
-4
t/t9145-git-svn-master-branch.sh
···
2
#
3
# Copyright (c) 2009 Eric Wong
4
#
5
-
test_description='git svn initial master branch is "trunk" if possible'
6
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
7
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
8
9
. ./lib-git-svn.sh
···
16
svn_cmd import -m b/b i "$svnrepo/branches/b"
17
'
18
19
-
test_expect_success 'git svn clone --stdlayout sets up trunk as master' '
20
git svn clone -s "$svnrepo" g &&
21
(
22
cd g &&
23
test x$(git rev-parse --verify refs/remotes/origin/trunk^0) = \
24
-
x$(git rev-parse --verify refs/heads/master^0)
25
)
26
'
27
···
2
#
3
# Copyright (c) 2009 Eric Wong
4
#
5
+
test_description='git svn initial main branch is "trunk" if possible'
6
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
7
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
8
9
. ./lib-git-svn.sh
···
16
svn_cmd import -m b/b i "$svnrepo/branches/b"
17
'
18
19
+
test_expect_success 'git svn clone --stdlayout sets up trunk as main' '
20
git svn clone -s "$svnrepo" g &&
21
(
22
cd g &&
23
test x$(git rev-parse --verify refs/remotes/origin/trunk^0) = \
24
+
x$(git rev-parse --verify refs/heads/main^0)
25
)
26
'
27
+2
-2
t/t9151-svn-mergeinfo.sh
+2
-2
t/t9151-svn-mergeinfo.sh
···
5
6
test_description='git-svn svn mergeinfo properties'
7
8
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
9
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
11
. ./lib-git-svn.sh
···
53
'
54
55
test_expect_failure 'everything got merged in the end' '
56
-
unmerged=$(git rev-list --all --not master) &&
57
[ -z "$unmerged" ]
58
'
59
···
5
6
test_description='git-svn svn mergeinfo properties'
7
8
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
9
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
11
. ./lib-git-svn.sh
···
53
'
54
55
test_expect_failure 'everything got merged in the end' '
56
+
unmerged=$(git rev-list --all --not main) &&
57
[ -z "$unmerged" ]
58
'
59
+2
-2
t/t9155-git-svn-fetch-deleted-tag.sh
+2
-2
t/t9155-git-svn-fetch-deleted-tag.sh
···
2
3
test_description='git svn fetch deleted tag'
4
5
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
6
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7
8
. ./lib-git-svn.sh
···
39
git svn fetch &&
40
41
git diff --exit-code origin/mybranch:trunk/subdir/file origin/tags/mytag:file &&
42
-
git diff --exit-code master:subdir/file origin/tags/mytag^:file
43
'
44
45
test_done
···
2
3
test_description='git svn fetch deleted tag'
4
5
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
6
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7
8
. ./lib-git-svn.sh
···
39
git svn fetch &&
40
41
git diff --exit-code origin/mybranch:trunk/subdir/file origin/tags/mytag:file &&
42
+
git diff --exit-code main:subdir/file origin/tags/mytag^:file
43
'
44
45
test_done
+4
-4
t/t9156-git-svn-fetch-deleted-tag-2.sh
+4
-4
t/t9156-git-svn-fetch-deleted-tag-2.sh
···
2
3
test_description='git svn fetch deleted tag 2'
4
5
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
6
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7
8
. ./lib-git-svn.sh
···
39
cd git_project &&
40
git svn fetch &&
41
42
-
git diff --exit-code master:subdir3/file origin/tags/mytag:file &&
43
-
git diff --exit-code master:subdir2/file origin/tags/mytag^:file &&
44
-
git diff --exit-code master:subdir1/file origin/tags/mytag^^:file
45
'
46
47
test_done
···
2
3
test_description='git svn fetch deleted tag 2'
4
5
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
6
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
7
8
. ./lib-git-svn.sh
···
39
cd git_project &&
40
git svn fetch &&
41
42
+
git diff --exit-code main:subdir3/file origin/tags/mytag:file &&
43
+
git diff --exit-code main:subdir2/file origin/tags/mytag^:file &&
44
+
git diff --exit-code main:subdir1/file origin/tags/mytag^^:file
45
'
46
47
test_done
+2
-2
t/t9163-git-svn-reset-clears-caches.sh
+2
-2
t/t9163-git-svn-reset-clears-caches.sh
···
4
#
5
6
test_description='git svn reset clears memoized caches'
7
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
8
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9
10
. ./lib-git-svn.sh
···
62
test_expect_success 'rebase looses SVN merge (m)' '
63
git svn rebase &&
64
git svn fetch &&
65
-
test 1 = $(git cat-file -p master|grep parent|wc -l)
66
'
67
68
# git svn fetch creates correct history with merge commit
···
4
#
5
6
test_description='git svn reset clears memoized caches'
7
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
8
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9
10
. ./lib-git-svn.sh
···
62
test_expect_success 'rebase looses SVN merge (m)' '
63
git svn rebase &&
64
git svn fetch &&
65
+
test 1 = $(git cat-file -p main|grep parent|wc -l)
66
'
67
68
# git svn fetch creates correct history with merge commit
+2
-2
t/t9169-git-svn-dcommit-crlf.sh
+2
-2
t/t9169-git-svn-dcommit-crlf.sh
···
1
#!/bin/sh
2
3
test_description='git svn dcommit CRLF'
4
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
5
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
6
7
. ./lib-git-svn.sh
···
17
p=$(git rev-parse HEAD) &&
18
t=$(git write-tree) &&
19
cmt=$(git commit-tree -p $p $t <cmt) &&
20
-
git update-ref refs/heads/master $cmt &&
21
git cat-file commit HEAD | tail -n4 >out &&
22
test_cmp cmt out &&
23
git svn dcommit &&
···
1
#!/bin/sh
2
3
test_description='git svn dcommit CRLF'
4
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
5
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
6
7
. ./lib-git-svn.sh
···
17
p=$(git rev-parse HEAD) &&
18
t=$(git write-tree) &&
19
cmt=$(git commit-tree -p $p $t <cmt) &&
20
+
git update-ref refs/heads/main $cmt &&
21
git cat-file commit HEAD | tail -n4 >out &&
22
test_cmp cmt out &&
23
git svn dcommit &&
+42
-42
t/t9300-fast-import.sh
+42
-42
t/t9300-fast-import.sh
···
4
#
5
6
test_description='test git fast-import utility'
7
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
8
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9
10
. ./test-lib.sh
···
65
mark :4
66
data $file4_len
67
$file4_data
68
-
commit refs/heads/master
69
mark :5
70
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
71
data <<COMMIT
···
120
121
INPUT_END
122
git fast-import --export-marks=marks.out <input &&
123
-
git whatchanged master
124
'
125
126
test_expect_success 'A: verify pack' '
···
134
135
initial
136
EOF
137
-
git cat-file commit master | sed 1d >actual &&
138
test_cmp expect actual
139
'
140
···
144
100644 blob file3
145
100755 blob file4
146
EOF
147
-
git cat-file -p master^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
148
test_cmp expect actual
149
'
150
151
test_expect_success 'A: verify file2' '
152
echo "$file2_data" >expect &&
153
-
git cat-file blob master:file2 >actual &&
154
test_cmp expect actual
155
'
156
157
test_expect_success 'A: verify file3' '
158
echo "$file3_data" >expect &&
159
-
git cat-file blob master:file3 >actual &&
160
test_cmp expect actual
161
'
162
163
test_expect_success 'A: verify file4' '
164
printf "$file4_data" >expect &&
165
-
git cat-file blob master:file4 >actual &&
166
test_cmp expect actual
167
'
168
169
test_expect_success 'A: verify tag/series-A' '
170
cat >expect <<-EOF &&
171
-
object $(git rev-parse refs/heads/master)
172
type commit
173
tag series-A
174
···
180
181
test_expect_success 'A: verify tag/series-A-blob' '
182
cat >expect <<-EOF &&
183
-
object $(git rev-parse refs/heads/master:file3)
184
type blob
185
tag series-A-blob
186
···
196
197
test_expect_success 'A: verify marks output' '
198
cat >expect <<-EOF &&
199
-
:2 $(git rev-parse --verify master:file2)
200
-
:3 $(git rev-parse --verify master:file3)
201
-
:4 $(git rev-parse --verify master:file4)
202
-
:5 $(git rev-parse --verify master^0)
203
:6 $(git cat-file tag nested | grep object | cut -d" " -f 2)
204
:7 $(git rev-parse --verify nested)
205
-
:8 $(git rev-parse --verify master^0)
206
EOF
207
test_cmp expect marks.out
208
'
···
220
new_blob=$(echo testing | git hash-object --stdin) &&
221
cat >input <<-INPUT_END &&
222
tag series-A-blob-2
223
-
from $(git rev-parse refs/heads/master:file3)
224
data <<EOF
225
Tag blob by sha1.
226
EOF
···
246
INPUT_END
247
248
cat >expect <<-EOF &&
249
-
object $(git rev-parse refs/heads/master:file3)
250
type blob
251
tag series-A-blob-2
252
···
287
'
288
289
test_expect_success 'A: verify diff' '
290
-
copy=$(git rev-parse --verify master:file2) &&
291
cat >expect <<-EOF &&
292
:000000 100755 $ZERO_OID $copy A copy-of-file2
293
EOF
294
-
git diff-tree -M -r master verify--import-marks >actual &&
295
compare_diff_raw expect actual &&
296
-
test $(git rev-parse --verify master:file2) \
297
= $(git rev-parse --verify verify--import-marks:copy-of-file2)
298
'
299
···
367
corrupt
368
COMMIT
369
370
-
from refs/heads/master
371
M 755 $(echo $ZERO_OID | sed -e "s/0$/1/") zero1
372
373
INPUT_END
···
384
tag base
385
COMMIT
386
387
-
from refs/heads/master
388
389
INPUT_END
390
···
393
git prune" &&
394
git fast-import <input &&
395
test -f .git/TEMP_TAG &&
396
-
test $(git rev-parse master) = $(git rev-parse TEMP_TAG^)
397
'
398
399
test_expect_success 'B: accept empty committer' '
···
531
532
test_expect_success 'C: incremental import create pack from stdin' '
533
newf=$(echo hi newf | git hash-object -w --stdin) &&
534
-
oldf=$(git rev-parse --verify master:file2) &&
535
-
thrf=$(git rev-parse --verify master:file3) &&
536
test_tick &&
537
cat >input <<-INPUT_END &&
538
commit refs/heads/branch
···
541
second
542
COMMIT
543
544
-
from refs/heads/master
545
M 644 $oldf file2/oldf
546
M 755 $newf file2/newf
547
D file3
···
563
564
test_expect_success 'C: verify commit' '
565
cat >expect <<-EOF &&
566
-
parent $(git rev-parse --verify master^0)
567
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
568
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
569
···
581
:100644 100644 $oldf $oldf R100 file2 file2/oldf
582
:100644 000000 $thrf $zero D file3
583
EOF
584
-
git diff-tree -M -r master branch >actual &&
585
compare_diff_raw expect actual
586
'
587
···
1701
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1702
data 8
1703
initial
1704
-
from refs/heads/master
1705
M 100644 :3 .gitmodules
1706
M 160000 :2 sub
1707
···
1736
(
1737
cd sub &&
1738
git init &&
1739
-
git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1740
-
git checkout master
1741
) &&
1742
git submodule init &&
1743
git submodule update
···
1761
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1762
data 8
1763
initial
1764
-
from refs/heads/master
1765
M 100644 :1 .gitmodules
1766
M 160000 $SUBPREV sub
1767
···
3432
data 4
3433
foo
3434
3435
-
reset refs/heads/master
3436
-
commit refs/heads/master
3437
mark :2
3438
author Full Name <user@company.tld> 1000000000 +0100
3439
committer Full Name <user@company.tld> 1000000000 +0100
···
3447
foo
3448
bar
3449
3450
-
commit refs/heads/master
3451
mark :4
3452
author Full Name <user@company.tld> 1000000001 +0100
3453
committer Full Name <user@company.tld> 1000000001 +0100
···
3464
data 4
3465
foo
3466
3467
-
reset refs/heads/master
3468
-
commit refs/heads/master
3469
mark :2
3470
author Full Name <user@company.tld> 2000000000 +0100
3471
committer Full Name <user@company.tld> 2000000000 +0100
···
3480
path = sub1
3481
url = https://void.example.com/main.git
3482
3483
-
commit refs/heads/master
3484
mark :4
3485
author Full Name <user@company.tld> 2000000001 +0100
3486
committer Full Name <user@company.tld> 2000000001 +0100
···
3496
foo
3497
bar
3498
3499
-
commit refs/heads/master
3500
mark :6
3501
author Full Name <user@company.tld> 2000000002 +0100
3502
committer Full Name <user@company.tld> 2000000002 +0100
···
3514
3515
test_expect_success 'Y: setup' '
3516
test_oid_cache <<-EOF
3517
-
Ymaster sha1:9afed2f9161ddf416c0a1863b8b0725b00070504
3518
-
Ymaster sha256:c0a1010da1df187b2e287654793df01b464bd6f8e3f17fc1481a7dadf84caee3
3519
EOF
3520
'
3521
···
3527
git -C sub2 fast-import --export-marks=../sub2-marks <../Y-sub-input &&
3528
git fast-import --rewrite-submodules-from=sub:../Y-marks \
3529
--rewrite-submodules-to=sub:sub2-marks <../Y-main-input &&
3530
-
test "$(git rev-parse master)" = "$(test_oid Ymaster)"
3531
)
3532
'
3533
···
4
#
5
6
test_description='test git fast-import utility'
7
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
8
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9
10
. ./test-lib.sh
···
65
mark :4
66
data $file4_len
67
$file4_data
68
+
commit refs/heads/main
69
mark :5
70
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
71
data <<COMMIT
···
120
121
INPUT_END
122
git fast-import --export-marks=marks.out <input &&
123
+
git whatchanged main
124
'
125
126
test_expect_success 'A: verify pack' '
···
134
135
initial
136
EOF
137
+
git cat-file commit main | sed 1d >actual &&
138
test_cmp expect actual
139
'
140
···
144
100644 blob file3
145
100755 blob file4
146
EOF
147
+
git cat-file -p main^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
148
test_cmp expect actual
149
'
150
151
test_expect_success 'A: verify file2' '
152
echo "$file2_data" >expect &&
153
+
git cat-file blob main:file2 >actual &&
154
test_cmp expect actual
155
'
156
157
test_expect_success 'A: verify file3' '
158
echo "$file3_data" >expect &&
159
+
git cat-file blob main:file3 >actual &&
160
test_cmp expect actual
161
'
162
163
test_expect_success 'A: verify file4' '
164
printf "$file4_data" >expect &&
165
+
git cat-file blob main:file4 >actual &&
166
test_cmp expect actual
167
'
168
169
test_expect_success 'A: verify tag/series-A' '
170
cat >expect <<-EOF &&
171
+
object $(git rev-parse refs/heads/main)
172
type commit
173
tag series-A
174
···
180
181
test_expect_success 'A: verify tag/series-A-blob' '
182
cat >expect <<-EOF &&
183
+
object $(git rev-parse refs/heads/main:file3)
184
type blob
185
tag series-A-blob
186
···
196
197
test_expect_success 'A: verify marks output' '
198
cat >expect <<-EOF &&
199
+
:2 $(git rev-parse --verify main:file2)
200
+
:3 $(git rev-parse --verify main:file3)
201
+
:4 $(git rev-parse --verify main:file4)
202
+
:5 $(git rev-parse --verify main^0)
203
:6 $(git cat-file tag nested | grep object | cut -d" " -f 2)
204
:7 $(git rev-parse --verify nested)
205
+
:8 $(git rev-parse --verify main^0)
206
EOF
207
test_cmp expect marks.out
208
'
···
220
new_blob=$(echo testing | git hash-object --stdin) &&
221
cat >input <<-INPUT_END &&
222
tag series-A-blob-2
223
+
from $(git rev-parse refs/heads/main:file3)
224
data <<EOF
225
Tag blob by sha1.
226
EOF
···
246
INPUT_END
247
248
cat >expect <<-EOF &&
249
+
object $(git rev-parse refs/heads/main:file3)
250
type blob
251
tag series-A-blob-2
252
···
287
'
288
289
test_expect_success 'A: verify diff' '
290
+
copy=$(git rev-parse --verify main:file2) &&
291
cat >expect <<-EOF &&
292
:000000 100755 $ZERO_OID $copy A copy-of-file2
293
EOF
294
+
git diff-tree -M -r main verify--import-marks >actual &&
295
compare_diff_raw expect actual &&
296
+
test $(git rev-parse --verify main:file2) \
297
= $(git rev-parse --verify verify--import-marks:copy-of-file2)
298
'
299
···
367
corrupt
368
COMMIT
369
370
+
from refs/heads/main
371
M 755 $(echo $ZERO_OID | sed -e "s/0$/1/") zero1
372
373
INPUT_END
···
384
tag base
385
COMMIT
386
387
+
from refs/heads/main
388
389
INPUT_END
390
···
393
git prune" &&
394
git fast-import <input &&
395
test -f .git/TEMP_TAG &&
396
+
test $(git rev-parse main) = $(git rev-parse TEMP_TAG^)
397
'
398
399
test_expect_success 'B: accept empty committer' '
···
531
532
test_expect_success 'C: incremental import create pack from stdin' '
533
newf=$(echo hi newf | git hash-object -w --stdin) &&
534
+
oldf=$(git rev-parse --verify main:file2) &&
535
+
thrf=$(git rev-parse --verify main:file3) &&
536
test_tick &&
537
cat >input <<-INPUT_END &&
538
commit refs/heads/branch
···
541
second
542
COMMIT
543
544
+
from refs/heads/main
545
M 644 $oldf file2/oldf
546
M 755 $newf file2/newf
547
D file3
···
563
564
test_expect_success 'C: verify commit' '
565
cat >expect <<-EOF &&
566
+
parent $(git rev-parse --verify main^0)
567
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
568
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
569
···
581
:100644 100644 $oldf $oldf R100 file2 file2/oldf
582
:100644 000000 $thrf $zero D file3
583
EOF
584
+
git diff-tree -M -r main branch >actual &&
585
compare_diff_raw expect actual
586
'
587
···
1701
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1702
data 8
1703
initial
1704
+
from refs/heads/main
1705
M 100644 :3 .gitmodules
1706
M 160000 :2 sub
1707
···
1736
(
1737
cd sub &&
1738
git init &&
1739
+
git fetch --update-head-ok .. refs/heads/sub:refs/heads/main &&
1740
+
git checkout main
1741
) &&
1742
git submodule init &&
1743
git submodule update
···
1761
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1762
data 8
1763
initial
1764
+
from refs/heads/main
1765
M 100644 :1 .gitmodules
1766
M 160000 $SUBPREV sub
1767
···
3432
data 4
3433
foo
3434
3435
+
reset refs/heads/main
3436
+
commit refs/heads/main
3437
mark :2
3438
author Full Name <user@company.tld> 1000000000 +0100
3439
committer Full Name <user@company.tld> 1000000000 +0100
···
3447
foo
3448
bar
3449
3450
+
commit refs/heads/main
3451
mark :4
3452
author Full Name <user@company.tld> 1000000001 +0100
3453
committer Full Name <user@company.tld> 1000000001 +0100
···
3464
data 4
3465
foo
3466
3467
+
reset refs/heads/main
3468
+
commit refs/heads/main
3469
mark :2
3470
author Full Name <user@company.tld> 2000000000 +0100
3471
committer Full Name <user@company.tld> 2000000000 +0100
···
3480
path = sub1
3481
url = https://void.example.com/main.git
3482
3483
+
commit refs/heads/main
3484
mark :4
3485
author Full Name <user@company.tld> 2000000001 +0100
3486
committer Full Name <user@company.tld> 2000000001 +0100
···
3496
foo
3497
bar
3498
3499
+
commit refs/heads/main
3500
mark :6
3501
author Full Name <user@company.tld> 2000000002 +0100
3502
committer Full Name <user@company.tld> 2000000002 +0100
···
3514
3515
test_expect_success 'Y: setup' '
3516
test_oid_cache <<-EOF
3517
+
Ymain sha1:9afed2f9161ddf416c0a1863b8b0725b00070504
3518
+
Ymain sha256:c0a1010da1df187b2e287654793df01b464bd6f8e3f17fc1481a7dadf84caee3
3519
EOF
3520
'
3521
···
3527
git -C sub2 fast-import --export-marks=../sub2-marks <../Y-sub-input &&
3528
git fast-import --rewrite-submodules-from=sub:../Y-marks \
3529
--rewrite-submodules-to=sub:sub2-marks <../Y-main-input &&
3530
+
test "$(git rev-parse main)" = "$(test_oid Ymain)"
3531
)
3532
'
3533
+8
-8
t/t9301-fast-import-notes.sh
+8
-8
t/t9301-fast-import-notes.sh
···
4
#
5
6
test_description='test git fast-import of notes objects'
7
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
8
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9
10
. ./test-lib.sh
···
12
13
test_tick
14
cat >input <<INPUT_END
15
-
commit refs/heads/master
16
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
17
data <<COMMIT
18
first commit
···
33
file baz/xyzzy in first commit
34
EOF
35
36
-
commit refs/heads/master
37
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
38
data <<COMMIT
39
second commit
···
49
file baz/xyzzy in second commit
50
EOF
51
52
-
commit refs/heads/master
53
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
54
data <<COMMIT
55
third commit
···
60
file foo in third commit
61
EOF
62
63
-
commit refs/heads/master
64
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
65
data <<COMMIT
66
fourth commit
···
73
74
INPUT_END
75
76
-
test_expect_success 'set up master branch' '
77
78
git fast-import <input &&
79
-
git whatchanged master
80
'
81
82
-
commit4=$(git rev-parse refs/heads/master)
83
commit3=$(git rev-parse "$commit4^")
84
commit2=$(git rev-parse "$commit4~2")
85
commit1=$(git rev-parse "$commit4~3")
···
4
#
5
6
test_description='test git fast-import of notes objects'
7
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
8
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9
10
. ./test-lib.sh
···
12
13
test_tick
14
cat >input <<INPUT_END
15
+
commit refs/heads/main
16
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
17
data <<COMMIT
18
first commit
···
33
file baz/xyzzy in first commit
34
EOF
35
36
+
commit refs/heads/main
37
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
38
data <<COMMIT
39
second commit
···
49
file baz/xyzzy in second commit
50
EOF
51
52
+
commit refs/heads/main
53
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
54
data <<COMMIT
55
third commit
···
60
file foo in third commit
61
EOF
62
63
+
commit refs/heads/main
64
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
65
data <<COMMIT
66
fourth commit
···
73
74
INPUT_END
75
76
+
test_expect_success 'set up main branch' '
77
78
git fast-import <input &&
79
+
git whatchanged main
80
'
81
82
+
commit4=$(git rev-parse refs/heads/main)
83
commit3=$(git rev-parse "$commit4^")
84
commit2=$(git rev-parse "$commit4~2")
85
commit1=$(git rev-parse "$commit4~3")
+8
-8
t/t9302-fast-import-unpack-limit.sh
+8
-8
t/t9302-fast-import-unpack-limit.sh
···
5
test_expect_success 'create loose objects on import' '
6
test_tick &&
7
cat >input <<-INPUT_END &&
8
-
commit refs/heads/master
9
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
10
data <<COMMIT
11
initial
···
23
test_expect_success 'bigger packs are preserved' '
24
test_tick &&
25
cat >input <<-INPUT_END &&
26
-
commit refs/heads/master
27
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
28
data <<COMMIT
29
incremental should create a pack
30
COMMIT
31
-
from refs/heads/master^0
32
33
commit refs/heads/branch
34
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
···
48
test_expect_success 'lookups after checkpoint works' '
49
hello_id=$(echo hello | git hash-object --stdin -t blob) &&
50
id="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
51
-
before=$(git rev-parse refs/heads/master^0) &&
52
(
53
cat <<-INPUT_END &&
54
blob
···
56
data 6
57
hello
58
59
-
commit refs/heads/master
60
mark :2
61
committer $id
62
data <<COMMIT
63
checkpoint after this
64
COMMIT
65
-
from refs/heads/master^0
66
M 100644 :1 hello
67
68
# pre-checkpoint
···
86
n=$(($n + 1))
87
fi &&
88
sleep 1 &&
89
-
from=$(git rev-parse refs/heads/master^0)
90
done &&
91
cat <<-INPUT_END &&
92
-
commit refs/heads/master
93
committer $id
94
data <<COMMIT
95
make sure from "unpacked sha1 reference" works, too
···
5
test_expect_success 'create loose objects on import' '
6
test_tick &&
7
cat >input <<-INPUT_END &&
8
+
commit refs/heads/main
9
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
10
data <<COMMIT
11
initial
···
23
test_expect_success 'bigger packs are preserved' '
24
test_tick &&
25
cat >input <<-INPUT_END &&
26
+
commit refs/heads/main
27
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
28
data <<COMMIT
29
incremental should create a pack
30
COMMIT
31
+
from refs/heads/main^0
32
33
commit refs/heads/branch
34
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
···
48
test_expect_success 'lookups after checkpoint works' '
49
hello_id=$(echo hello | git hash-object --stdin -t blob) &&
50
id="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
51
+
before=$(git rev-parse refs/heads/main^0) &&
52
(
53
cat <<-INPUT_END &&
54
blob
···
56
data 6
57
hello
58
59
+
commit refs/heads/main
60
mark :2
61
committer $id
62
data <<COMMIT
63
checkpoint after this
64
COMMIT
65
+
from refs/heads/main^0
66
M 100644 :1 hello
67
68
# pre-checkpoint
···
86
n=$(($n + 1))
87
fi &&
88
sleep 1 &&
89
+
from=$(git rev-parse refs/heads/main^0)
90
done &&
91
cat <<-INPUT_END &&
92
+
commit refs/heads/main
93
committer $id
94
data <<COMMIT
95
make sure from "unpacked sha1 reference" works, too
+44
-44
t/t9350-fast-export.sh
+44
-44
t/t9350-fast-export.sh
···
4
#
5
6
test_description='git fast-export'
7
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
8
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9
10
. ./test-lib.sh
···
34
git commit -m sitzt file2 &&
35
test_tick &&
36
git tag -a -m valentin muss &&
37
-
git merge -s ours master
38
39
'
40
41
test_expect_success 'fast-export | fast-import' '
42
43
-
MASTER=$(git rev-parse --verify master) &&
44
REIN=$(git rev-parse --verify rein) &&
45
WER=$(git rev-parse --verify wer) &&
46
MUSS=$(git rev-parse --verify muss) &&
···
49
git fast-export --all >actual &&
50
(cd new &&
51
git fast-import &&
52
-
test $MASTER = $(git rev-parse --verify refs/heads/master) &&
53
test $REIN = $(git rev-parse --verify refs/tags/rein) &&
54
test $WER = $(git rev-parse --verify refs/heads/wer) &&
55
test $MUSS = $(git rev-parse --verify refs/tags/muss)) <actual
···
83
test_cmp expected actual
84
'
85
86
-
test_expect_success 'fast-export master~2..master' '
87
88
-
git fast-export master~2..master >actual &&
89
-
sed "s/master/partial/" actual |
90
(cd new &&
91
git fast-import &&
92
-
test $MASTER != $(git rev-parse --verify refs/heads/partial) &&
93
-
git diff --exit-code master partial &&
94
-
git diff --exit-code master^ partial^ &&
95
test_must_fail git rev-parse partial~2)
96
97
'
98
99
-
test_expect_success 'fast-export --reference-excluded-parents master~2..master' '
100
101
-
git fast-export --reference-excluded-parents master~2..master >actual &&
102
-
grep commit.refs/heads/master actual >commit-count &&
103
test_line_count = 2 commit-count &&
104
-
sed "s/master/rewrite/" actual |
105
(cd new &&
106
git fast-import &&
107
-
test $MASTER = $(git rev-parse --verify refs/heads/rewrite))
108
'
109
110
test_expect_success 'fast-export --show-original-ids' '
111
112
-
git fast-export --show-original-ids master >output &&
113
grep ^original-oid output| sed -e s/^original-oid.// | sort >actual &&
114
-
git rev-list --objects master muss >objects-and-names &&
115
awk "{print \$1}" objects-and-names | sort >commits-trees-blobs &&
116
comm -23 actual commits-trees-blobs >unfound &&
117
test_must_be_empty unfound
···
119
120
test_expect_success 'fast-export --show-original-ids | git fast-import' '
121
122
-
git fast-export --show-original-ids master muss | git fast-import --quiet &&
123
-
test $MASTER = $(git rev-parse --verify refs/heads/master) &&
124
test $MUSS = $(git rev-parse --verify refs/tags/muss)
125
'
126
···
203
204
test_expect_success 'import/export-marks' '
205
206
-
git checkout -b marks master &&
207
git fast-export --export-marks=tmp-marks HEAD &&
208
test -s tmp-marks &&
209
test_line_count = 3 tmp-marks &&
···
268
269
test_expect_success 'setup submodule' '
270
271
-
git checkout -f master &&
272
mkdir sub &&
273
(
274
cd sub &&
···
293
294
test_expect_success 'submodule fast-export | fast-import' '
295
296
-
SUBENT1=$(git ls-tree master^ sub) &&
297
-
SUBENT2=$(git ls-tree master sub) &&
298
rm -rf new &&
299
mkdir new &&
300
git --git-dir=new/.git init &&
301
git fast-export --signed-tags=strip --all >actual &&
302
(cd new &&
303
git fast-import &&
304
-
test "$SUBENT1" = "$(git ls-tree refs/heads/master^ sub)" &&
305
-
test "$SUBENT2" = "$(git ls-tree refs/heads/master sub)" &&
306
-
git checkout master &&
307
git submodule init &&
308
git submodule update &&
309
cmp sub/file ../sub/file) <actual
···
355
356
'
357
358
-
test_expect_success 'fast-export | fast-import when master is tagged' '
359
360
git tag -m msg last &&
361
git fast-export -C -C --signed-tags=strip --all > output &&
···
470
data 3
471
hi
472
473
-
reset refs/heads/master
474
-
commit refs/heads/master
475
mark :3
476
author A U Thor <author@example.com> 1112912713 -0700
477
committer C O Mitter <committer@example.com> 1112912713 -0700
···
485
test_expect_failure 'no exact-ref revisions included' '
486
(
487
cd limit-by-paths &&
488
-
git fast-export master~2..master~1 > output &&
489
test_cmp expected output
490
)
491
'
···
527
'
528
529
test_expect_success 'set-up a few more tags for tag export tests' '
530
-
git checkout -f master &&
531
HEAD_TREE=$(git show -s --pretty=raw HEAD | grep tree | sed "s/tree //") &&
532
git tag tree_tag -m "tagging a tree" $HEAD_TREE &&
533
git tag -a tree_tag-obj -m "tagging a tree" $HEAD_TREE &&
···
552
test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
553
554
test_expect_success 'handling tags of blobs' '
555
-
git tag -a -m "Tag of a blob" blobtag $(git rev-parse master:file) &&
556
git fast-export blobtag >actual &&
557
cat >expect <<-EOF &&
558
blob
···
595
) &&
596
(
597
cd dirtosymlink &&
598
-
git fast-export master -- foo |
599
(cd ../result && git fast-import --quiet)
600
) &&
601
-
(cd result && git show master:foo)
602
'
603
604
test_expect_success 'fast-export quotes pathnames' '
···
646
data 5
647
bump
648
649
-
commit refs/heads/master
650
mark :14
651
author A U Thor <author@example.com> 1112912773 -0700
652
committer C O Mitter <committer@example.com> 1112912773 -0700
···
660
test_expect_success 'avoid uninteresting refs' '
661
> tmp-marks &&
662
git fast-export --import-marks=tmp-marks \
663
-
--export-marks=tmp-marks master > /dev/null &&
664
git tag v1.0 &&
665
git branch uninteresting &&
666
echo bump > file &&
667
git commit -a -m bump &&
668
git fast-export --import-marks=tmp-marks \
669
-
--export-marks=tmp-marks ^uninteresting ^v1.0 master > actual &&
670
test_cmp expected actual
671
'
672
673
cat > expected << EOF
674
-
reset refs/heads/master
675
from :14
676
677
EOF
···
679
test_expect_success 'refs are updated even if no commits need to be exported' '
680
> tmp-marks &&
681
git fast-export --import-marks=tmp-marks \
682
-
--export-marks=tmp-marks master > /dev/null &&
683
git fast-export --import-marks=tmp-marks \
684
-
--export-marks=tmp-marks master > actual &&
685
test_cmp expected actual
686
'
687
688
test_expect_success 'use refspec' '
689
-
git fast-export --refspec refs/heads/master:refs/heads/foobar master >actual2 &&
690
grep "^commit " actual2 | sort | uniq >actual &&
691
echo "commit refs/heads/foobar" > expected &&
692
test_cmp expected actual
···
739
test_commit initial &&
740
git checkout -b topic &&
741
test_commit on-topic &&
742
-
git checkout master &&
743
-
test_commit on-master &&
744
test_tick &&
745
git merge --no-ff -m Yeah topic &&
746
747
echo ":1 $(git rev-parse HEAD^^)" >marks &&
748
-
git fast-export --import-marks=marks master >out &&
749
grep Yeah out
750
)
751
'
···
4
#
5
6
test_description='git fast-export'
7
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
8
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9
10
. ./test-lib.sh
···
34
git commit -m sitzt file2 &&
35
test_tick &&
36
git tag -a -m valentin muss &&
37
+
git merge -s ours main
38
39
'
40
41
test_expect_success 'fast-export | fast-import' '
42
43
+
MAIN=$(git rev-parse --verify main) &&
44
REIN=$(git rev-parse --verify rein) &&
45
WER=$(git rev-parse --verify wer) &&
46
MUSS=$(git rev-parse --verify muss) &&
···
49
git fast-export --all >actual &&
50
(cd new &&
51
git fast-import &&
52
+
test $MAIN = $(git rev-parse --verify refs/heads/main) &&
53
test $REIN = $(git rev-parse --verify refs/tags/rein) &&
54
test $WER = $(git rev-parse --verify refs/heads/wer) &&
55
test $MUSS = $(git rev-parse --verify refs/tags/muss)) <actual
···
83
test_cmp expected actual
84
'
85
86
+
test_expect_success 'fast-export main~2..main' '
87
88
+
git fast-export main~2..main >actual &&
89
+
sed "s/main/partial/" actual |
90
(cd new &&
91
git fast-import &&
92
+
test $MAIN != $(git rev-parse --verify refs/heads/partial) &&
93
+
git diff --exit-code main partial &&
94
+
git diff --exit-code main^ partial^ &&
95
test_must_fail git rev-parse partial~2)
96
97
'
98
99
+
test_expect_success 'fast-export --reference-excluded-parents main~2..main' '
100
101
+
git fast-export --reference-excluded-parents main~2..main >actual &&
102
+
grep commit.refs/heads/main actual >commit-count &&
103
test_line_count = 2 commit-count &&
104
+
sed "s/main/rewrite/" actual |
105
(cd new &&
106
git fast-import &&
107
+
test $MAIN = $(git rev-parse --verify refs/heads/rewrite))
108
'
109
110
test_expect_success 'fast-export --show-original-ids' '
111
112
+
git fast-export --show-original-ids main >output &&
113
grep ^original-oid output| sed -e s/^original-oid.// | sort >actual &&
114
+
git rev-list --objects main muss >objects-and-names &&
115
awk "{print \$1}" objects-and-names | sort >commits-trees-blobs &&
116
comm -23 actual commits-trees-blobs >unfound &&
117
test_must_be_empty unfound
···
119
120
test_expect_success 'fast-export --show-original-ids | git fast-import' '
121
122
+
git fast-export --show-original-ids main muss | git fast-import --quiet &&
123
+
test $MAIN = $(git rev-parse --verify refs/heads/main) &&
124
test $MUSS = $(git rev-parse --verify refs/tags/muss)
125
'
126
···
203
204
test_expect_success 'import/export-marks' '
205
206
+
git checkout -b marks main &&
207
git fast-export --export-marks=tmp-marks HEAD &&
208
test -s tmp-marks &&
209
test_line_count = 3 tmp-marks &&
···
268
269
test_expect_success 'setup submodule' '
270
271
+
git checkout -f main &&
272
mkdir sub &&
273
(
274
cd sub &&
···
293
294
test_expect_success 'submodule fast-export | fast-import' '
295
296
+
SUBENT1=$(git ls-tree main^ sub) &&
297
+
SUBENT2=$(git ls-tree main sub) &&
298
rm -rf new &&
299
mkdir new &&
300
git --git-dir=new/.git init &&
301
git fast-export --signed-tags=strip --all >actual &&
302
(cd new &&
303
git fast-import &&
304
+
test "$SUBENT1" = "$(git ls-tree refs/heads/main^ sub)" &&
305
+
test "$SUBENT2" = "$(git ls-tree refs/heads/main sub)" &&
306
+
git checkout main &&
307
git submodule init &&
308
git submodule update &&
309
cmp sub/file ../sub/file) <actual
···
355
356
'
357
358
+
test_expect_success 'fast-export | fast-import when main is tagged' '
359
360
git tag -m msg last &&
361
git fast-export -C -C --signed-tags=strip --all > output &&
···
470
data 3
471
hi
472
473
+
reset refs/heads/main
474
+
commit refs/heads/main
475
mark :3
476
author A U Thor <author@example.com> 1112912713 -0700
477
committer C O Mitter <committer@example.com> 1112912713 -0700
···
485
test_expect_failure 'no exact-ref revisions included' '
486
(
487
cd limit-by-paths &&
488
+
git fast-export main~2..main~1 > output &&
489
test_cmp expected output
490
)
491
'
···
527
'
528
529
test_expect_success 'set-up a few more tags for tag export tests' '
530
+
git checkout -f main &&
531
HEAD_TREE=$(git show -s --pretty=raw HEAD | grep tree | sed "s/tree //") &&
532
git tag tree_tag -m "tagging a tree" $HEAD_TREE &&
533
git tag -a tree_tag-obj -m "tagging a tree" $HEAD_TREE &&
···
552
test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
553
554
test_expect_success 'handling tags of blobs' '
555
+
git tag -a -m "Tag of a blob" blobtag $(git rev-parse main:file) &&
556
git fast-export blobtag >actual &&
557
cat >expect <<-EOF &&
558
blob
···
595
) &&
596
(
597
cd dirtosymlink &&
598
+
git fast-export main -- foo |
599
(cd ../result && git fast-import --quiet)
600
) &&
601
+
(cd result && git show main:foo)
602
'
603
604
test_expect_success 'fast-export quotes pathnames' '
···
646
data 5
647
bump
648
649
+
commit refs/heads/main
650
mark :14
651
author A U Thor <author@example.com> 1112912773 -0700
652
committer C O Mitter <committer@example.com> 1112912773 -0700
···
660
test_expect_success 'avoid uninteresting refs' '
661
> tmp-marks &&
662
git fast-export --import-marks=tmp-marks \
663
+
--export-marks=tmp-marks main > /dev/null &&
664
git tag v1.0 &&
665
git branch uninteresting &&
666
echo bump > file &&
667
git commit -a -m bump &&
668
git fast-export --import-marks=tmp-marks \
669
+
--export-marks=tmp-marks ^uninteresting ^v1.0 main > actual &&
670
test_cmp expected actual
671
'
672
673
cat > expected << EOF
674
+
reset refs/heads/main
675
from :14
676
677
EOF
···
679
test_expect_success 'refs are updated even if no commits need to be exported' '
680
> tmp-marks &&
681
git fast-export --import-marks=tmp-marks \
682
+
--export-marks=tmp-marks main > /dev/null &&
683
git fast-export --import-marks=tmp-marks \
684
+
--export-marks=tmp-marks main > actual &&
685
test_cmp expected actual
686
'
687
688
test_expect_success 'use refspec' '
689
+
git fast-export --refspec refs/heads/main:refs/heads/foobar main >actual2 &&
690
grep "^commit " actual2 | sort | uniq >actual &&
691
echo "commit refs/heads/foobar" > expected &&
692
test_cmp expected actual
···
739
test_commit initial &&
740
git checkout -b topic &&
741
test_commit on-topic &&
742
+
git checkout main &&
743
+
test_commit on-main &&
744
test_tick &&
745
git merge --no-ff -m Yeah topic &&
746
747
echo ":1 $(git rev-parse HEAD^^)" >marks &&
748
+
git fast-export --import-marks=marks main >out &&
749
grep Yeah out
750
)
751
'
+3
-3
t/t9351-fast-export-anonymize.sh
+3
-3
t/t9351-fast-export-anonymize.sh
···
1
#!/bin/sh
2
3
test_description='basic tests for fast-export --anonymize'
4
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
5
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
6
7
. ./test-lib.sh
···
54
'
55
56
test_expect_success 'stream omits other refnames' '
57
-
! grep master stream &&
58
! grep mytag stream
59
'
60
···
88
shape () {
89
git log --format="%m %ct" --left-right --boundary "$@"
90
} &&
91
-
(cd .. && shape master...other) >expect &&
92
shape $main_branch...$other_branch >actual &&
93
test_cmp expect actual
94
'
···
1
#!/bin/sh
2
3
test_description='basic tests for fast-export --anonymize'
4
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
5
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
6
7
. ./test-lib.sh
···
54
'
55
56
test_expect_success 'stream omits other refnames' '
57
+
! grep main stream &&
58
! grep mytag stream
59
'
60
···
88
shape () {
89
git log --format="%m %ct" --left-right --boundary "$@"
90
} &&
91
+
(cd .. && shape main...other) >expect &&
92
shape $main_branch...$other_branch >actual &&
93
test_cmp expect actual
94
'
+17
-17
t/t9400-git-cvsserver-server.sh
+17
-17
t/t9400-git-cvsserver-server.sh
···
8
tests read access to a git repository with the
9
cvs CLI client via git-cvsserver server'
10
11
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
12
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
13
14
. ./test-lib.sh
···
48
touch secondrootfile &&
49
git add secondrootfile &&
50
git commit -m "second root") &&
51
-
git fetch secondroot master &&
52
git merge --allow-unrelated-histories FETCH_HEAD &&
53
git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
54
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
···
60
# note that cvs doesn't accept absolute pathnames
61
# as argument to co -d
62
test_expect_success 'basic checkout' \
63
-
'GIT_CONFIG="$git_config" cvs -Q co -d cvswork master &&
64
test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | head -n 1))" = "empty/1.1/" &&
65
test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | sed -ne \$p))" = "secondrootfile/1.1/"'
66
···
229
230
test_expect_success 'gitcvs.enabled = false' \
231
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
232
-
if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
233
then
234
echo unexpected cvs success
235
false
···
243
test_expect_success 'gitcvs.ext.enabled = true' \
244
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
245
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
246
-
GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
247
test_cmp cvswork cvswork2'
248
249
rm -fr cvswork2
250
test_expect_success 'gitcvs.ext.enabled = false' \
251
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
252
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
253
-
if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
254
then
255
echo unexpected cvs success
256
false
···
264
test_expect_success 'gitcvs.dbname' \
265
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
266
GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
267
-
GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
268
test_cmp cvswork cvswork2 &&
269
-
test -f "$SERVERDIR/gitcvs.ext.master.sqlite" &&
270
-
cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs.ext.master.sqlite"'
271
272
rm -fr cvswork2
273
test_expect_success 'gitcvs.ext.dbname' \
274
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
275
GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
276
GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
277
-
GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
278
test_cmp cvswork cvswork2 &&
279
-
test -f "$SERVERDIR/gitcvs1.ext.master.sqlite" &&
280
-
test ! -f "$SERVERDIR/gitcvs2.ext.master.sqlite" &&
281
-
cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs1.ext.master.sqlite"'
282
283
284
#------------
···
460
test_expect_success 'cvs update (module list supports packed refs)' '
461
GIT_DIR="$SERVERDIR" git pack-refs --all &&
462
GIT_CONFIG="$git_config" cvs -n up -d 2> out &&
463
-
grep "cvs update: New directory \`master'\''" < out
464
'
465
466
#------------
···
502
cd "$WORKDIR"
503
test_expect_success 'cvs co -c (shows module database)' '
504
GIT_CONFIG="$git_config" cvs co -c > out &&
505
-
grep "^master[ ][ ]*master$" <out &&
506
-
! grep -v "^master[ ][ ]*master$" <out
507
'
508
509
#------------
···
529
530
sed -e 's/^x//' -e 's/SP$/ /' > "$WORKDIR/expect" <<EOF
531
x
532
-
xRCS file: $WORKDIR/gitcvs.git/master/merge,v
533
xWorking file: merge
534
xhead: 1.4
535
xbranch:
···
8
tests read access to a git repository with the
9
cvs CLI client via git-cvsserver server'
10
11
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
12
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
13
14
. ./test-lib.sh
···
48
touch secondrootfile &&
49
git add secondrootfile &&
50
git commit -m "second root") &&
51
+
git fetch secondroot main &&
52
git merge --allow-unrelated-histories FETCH_HEAD &&
53
git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
54
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
···
60
# note that cvs doesn't accept absolute pathnames
61
# as argument to co -d
62
test_expect_success 'basic checkout' \
63
+
'GIT_CONFIG="$git_config" cvs -Q co -d cvswork main &&
64
test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | head -n 1))" = "empty/1.1/" &&
65
test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | sed -ne \$p))" = "secondrootfile/1.1/"'
66
···
229
230
test_expect_success 'gitcvs.enabled = false' \
231
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
232
+
if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
233
then
234
echo unexpected cvs success
235
false
···
243
test_expect_success 'gitcvs.ext.enabled = true' \
244
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
245
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
246
+
GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
247
test_cmp cvswork cvswork2'
248
249
rm -fr cvswork2
250
test_expect_success 'gitcvs.ext.enabled = false' \
251
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
252
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
253
+
if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
254
then
255
echo unexpected cvs success
256
false
···
264
test_expect_success 'gitcvs.dbname' \
265
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
266
GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
267
+
GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
268
test_cmp cvswork cvswork2 &&
269
+
test -f "$SERVERDIR/gitcvs.ext.main.sqlite" &&
270
+
cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs.ext.main.sqlite"'
271
272
rm -fr cvswork2
273
test_expect_success 'gitcvs.ext.dbname' \
274
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
275
GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
276
GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
277
+
GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
278
test_cmp cvswork cvswork2 &&
279
+
test -f "$SERVERDIR/gitcvs1.ext.main.sqlite" &&
280
+
test ! -f "$SERVERDIR/gitcvs2.ext.main.sqlite" &&
281
+
cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs1.ext.main.sqlite"'
282
283
284
#------------
···
460
test_expect_success 'cvs update (module list supports packed refs)' '
461
GIT_DIR="$SERVERDIR" git pack-refs --all &&
462
GIT_CONFIG="$git_config" cvs -n up -d 2> out &&
463
+
grep "cvs update: New directory \`main'\''" < out
464
'
465
466
#------------
···
502
cd "$WORKDIR"
503
test_expect_success 'cvs co -c (shows module database)' '
504
GIT_CONFIG="$git_config" cvs co -c > out &&
505
+
grep "^main[ ][ ]*main$" <out &&
506
+
! grep -v "^main[ ][ ]*main$" <out
507
'
508
509
#------------
···
529
530
sed -e 's/^x//' -e 's/SP$/ /' > "$WORKDIR/expect" <<EOF
531
x
532
+
xRCS file: $WORKDIR/gitcvs.git/main/merge,v
533
xWorking file: merge
534
xhead: 1.4
535
xbranch:
+9
-9
t/t9401-git-cvsserver-crlf.sh
+9
-9
t/t9401-git-cvsserver-crlf.sh
···
9
tests -kb mode for binary files when accessing a git
10
repository using cvs CLI client via git-cvsserver server'
11
12
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
13
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
14
15
. ./test-lib.sh
···
108
'
109
110
test_expect_success 'cvs co (default crlf)' '
111
-
GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
112
test x"$(grep '/-k' cvswork/CVS/Entries cvswork/subdir/CVS/Entries)" = x""
113
'
114
115
rm -rf cvswork
116
test_expect_success 'cvs co (allbinary)' '
117
GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary true &&
118
-
GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
119
marked_as cvswork textfile.c -kb &&
120
marked_as cvswork binfile.bin -kb &&
121
marked_as cvswork .gitattributes -kb &&
···
128
rm -rf cvswork cvs.log
129
test_expect_success 'cvs co (use attributes/allbinary)' '
130
GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr true &&
131
-
GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
132
marked_as cvswork textfile.c "" &&
133
marked_as cvswork binfile.bin -kb &&
134
marked_as cvswork .gitattributes -kb &&
···
141
rm -rf cvswork
142
test_expect_success 'cvs co (use attributes)' '
143
GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary false &&
144
-
GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
145
marked_as cvswork textfile.c "" &&
146
marked_as cvswork binfile.bin -kb &&
147
marked_as cvswork .gitattributes "" &&
···
197
rm -rf cvswork
198
test_expect_success 'cvs co (use attributes/guess)' '
199
GIT_DIR="$SERVERDIR" git config gitcvs.allbinary guess &&
200
-
GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
201
marked_as cvswork textfile.c "" &&
202
marked_as cvswork binfile.bin -kb &&
203
marked_as cvswork .gitattributes "" &&
···
227
rm -rf cvswork
228
test_expect_success 'cvs co (guess)' '
229
GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr false &&
230
-
GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
231
marked_as cvswork textfile.c "" &&
232
marked_as cvswork binfile.bin -kb &&
233
marked_as cvswork .gitattributes "" &&
···
242
'
243
244
test_expect_success 'cvs co another copy (guess)' '
245
-
GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
246
marked_as cvswork2 textfile.c "" &&
247
marked_as cvswork2 binfile.bin -kb &&
248
marked_as cvswork2 .gitattributes "" &&
···
338
339
echo "starting update/merge" >> "${WORKDIR}/marked.log"
340
test_expect_success 'update/merge full other copy (guess)' '
341
-
git pull gitcvs.git master &&
342
sed "s/3/replaced_3/" < multilineTxt.c > ml.temp &&
343
mv ml.temp multilineTxt.c &&
344
git add multilineTxt.c &&
···
9
tests -kb mode for binary files when accessing a git
10
repository using cvs CLI client via git-cvsserver server'
11
12
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
13
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
14
15
. ./test-lib.sh
···
108
'
109
110
test_expect_success 'cvs co (default crlf)' '
111
+
GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
112
test x"$(grep '/-k' cvswork/CVS/Entries cvswork/subdir/CVS/Entries)" = x""
113
'
114
115
rm -rf cvswork
116
test_expect_success 'cvs co (allbinary)' '
117
GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary true &&
118
+
GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
119
marked_as cvswork textfile.c -kb &&
120
marked_as cvswork binfile.bin -kb &&
121
marked_as cvswork .gitattributes -kb &&
···
128
rm -rf cvswork cvs.log
129
test_expect_success 'cvs co (use attributes/allbinary)' '
130
GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr true &&
131
+
GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
132
marked_as cvswork textfile.c "" &&
133
marked_as cvswork binfile.bin -kb &&
134
marked_as cvswork .gitattributes -kb &&
···
141
rm -rf cvswork
142
test_expect_success 'cvs co (use attributes)' '
143
GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary false &&
144
+
GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
145
marked_as cvswork textfile.c "" &&
146
marked_as cvswork binfile.bin -kb &&
147
marked_as cvswork .gitattributes "" &&
···
197
rm -rf cvswork
198
test_expect_success 'cvs co (use attributes/guess)' '
199
GIT_DIR="$SERVERDIR" git config gitcvs.allbinary guess &&
200
+
GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
201
marked_as cvswork textfile.c "" &&
202
marked_as cvswork binfile.bin -kb &&
203
marked_as cvswork .gitattributes "" &&
···
227
rm -rf cvswork
228
test_expect_success 'cvs co (guess)' '
229
GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr false &&
230
+
GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
231
marked_as cvswork textfile.c "" &&
232
marked_as cvswork binfile.bin -kb &&
233
marked_as cvswork .gitattributes "" &&
···
242
'
243
244
test_expect_success 'cvs co another copy (guess)' '
245
+
GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
246
marked_as cvswork2 textfile.c "" &&
247
marked_as cvswork2 binfile.bin -kb &&
248
marked_as cvswork2 .gitattributes "" &&
···
338
339
echo "starting update/merge" >> "${WORKDIR}/marked.log"
340
test_expect_success 'update/merge full other copy (guess)' '
341
+
git pull gitcvs.git main &&
342
sed "s/3/replaced_3/" < multilineTxt.c > ml.temp &&
343
mv ml.temp multilineTxt.c &&
344
git add multilineTxt.c &&
+5
-5
t/t9402-git-cvsserver-refs.sh
+5
-5
t/t9402-git-cvsserver-refs.sh
···
5
tests ability for git-cvsserver to switch between and compare
6
tags, branches and other git refspecs'
7
8
-
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
9
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
11
. ./test-lib.sh
···
118
119
rm -rf cvswork
120
test_expect_success 'cvs co v1' '
121
-
cvs -f -Q co -r v1 -d cvswork master >cvs.log 2>&1 &&
122
check_start_tree cvswork &&
123
check_file cvswork textfile.c v1 &&
124
check_file cvswork t2 v1 &&
···
131
132
rm -rf cvswork
133
test_expect_success 'cvs co b1' '
134
-
cvs -f co -r b1 -d cvswork master >cvs.log 2>&1 &&
135
check_start_tree cvswork &&
136
check_file cvswork textfile.c v1 &&
137
check_file cvswork t2 v1 &&
···
143
'
144
145
test_expect_success 'cvs co b1 [cvswork3]' '
146
-
cvs -f co -r b1 -d cvswork3 master >cvs.log 2>&1 &&
147
check_start_tree cvswork3 &&
148
check_file cvswork3 textfile.c v1 &&
149
check_file cvswork3 t2 v1 &&
···
268
'
269
270
test_expect_success 'cvs co b2 [into cvswork2]' '
271
-
cvs -f co -r b2 -d cvswork2 master >cvs.log 2>&1 &&
272
check_start_tree cvswork &&
273
check_file cvswork textfile.c v1 &&
274
check_file cvswork t2 v1 &&
···
5
tests ability for git-cvsserver to switch between and compare
6
tags, branches and other git refspecs'
7
8
+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
9
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
10
11
. ./test-lib.sh
···
118
119
rm -rf cvswork
120
test_expect_success 'cvs co v1' '
121
+
cvs -f -Q co -r v1 -d cvswork main >cvs.log 2>&1 &&
122
check_start_tree cvswork &&
123
check_file cvswork textfile.c v1 &&
124
check_file cvswork t2 v1 &&
···
131
132
rm -rf cvswork
133
test_expect_success 'cvs co b1' '
134
+
cvs -f co -r b1 -d cvswork main >cvs.log 2>&1 &&
135
check_start_tree cvswork &&
136
check_file cvswork textfile.c v1 &&
137
check_file cvswork t2 v1 &&
···
143
'
144
145
test_expect_success 'cvs co b1 [cvswork3]' '
146
+
cvs -f co -r b1 -d cvswork3 main >cvs.log 2>&1 &&
147
check_start_tree cvswork3 &&
148
check_file cvswork3 textfile.c v1 &&
149
check_file cvswork3 t2 v1 &&
···
268
'
269
270
test_expect_success 'cvs co b2 [into cvswork2]' '
271
+
cvs -f co -r b2 -d cvswork2 main >cvs.log 2>&1 &&
272
check_start_tree cvswork &&
273
check_file cvswork textfile.c v1 &&
274
check_file cvswork t2 v1 &&