initial_ref_transaction_commit(): check for ref D/F conflicts
[git/gitweb.git] / t / t5700-clone-reference.sh
blob3e783fc450d21c8de6fae2cb3677e9eaebacf927
1 #!/bin/sh
3 # Copyright (C) 2006 Martin Waitz <tali@admingilde.org>
6 test_description='test clone --reference'
7 . ./test-lib.sh
9 base_dir=`pwd`
11 U=$base_dir/UPLOAD_LOG
13 test_expect_success 'preparing first repository' \
14 'test_create_repo A && cd A &&
15 echo first > file1 &&
16 git add file1 &&
17 git commit -m initial'
19 cd "$base_dir"
21 test_expect_success 'preparing second repository' \
22 'git clone A B && cd B &&
23 echo second > file2 &&
24 git add file2 &&
25 git commit -m addition &&
26 git repack -a -d &&
27 git prune'
29 cd "$base_dir"
31 test_expect_success 'cloning with reference (-l -s)' \
32 'git clone -l -s --reference B A C'
34 cd "$base_dir"
36 test_expect_success 'existence of info/alternates' \
37 'test_line_count = 2 C/.git/objects/info/alternates'
39 cd "$base_dir"
41 test_expect_success 'pulling from reference' \
42 'cd C &&
43 git pull ../B master'
45 cd "$base_dir"
47 test_expect_success 'that reference gets used' \
48 'cd C &&
49 echo "0 objects, 0 kilobytes" > expected &&
50 git count-objects > current &&
51 test_cmp expected current'
53 cd "$base_dir"
55 rm -f "$U.D"
57 test_expect_success 'cloning with reference (no -l -s)' '
58 GIT_TRACE_PACKET=$U.D git clone --reference B "file://$(pwd)/A" D
61 test_expect_success 'fetched no objects' '
62 test -s "$U.D" &&
63 ! grep " want" "$U.D"
66 cd "$base_dir"
68 test_expect_success 'existence of info/alternates' \
69 'test_line_count = 1 D/.git/objects/info/alternates'
71 cd "$base_dir"
73 test_expect_success 'pulling from reference' \
74 'cd D && git pull ../B master'
76 cd "$base_dir"
78 test_expect_success 'that reference gets used' \
79 'cd D && echo "0 objects, 0 kilobytes" > expected &&
80 git count-objects > current &&
81 test_cmp expected current'
83 cd "$base_dir"
85 test_expect_success 'updating origin' \
86 'cd A &&
87 echo third > file3 &&
88 git add file3 &&
89 git commit -m update &&
90 git repack -a -d &&
91 git prune'
93 cd "$base_dir"
95 test_expect_success 'pulling changes from origin' \
96 'cd C &&
97 git pull origin'
99 cd "$base_dir"
101 # the 2 local objects are commit and tree from the merge
102 test_expect_success 'that alternate to origin gets used' \
103 'cd C &&
104 echo "2 objects" > expected &&
105 git count-objects | cut -d, -f1 > current &&
106 test_cmp expected current'
108 cd "$base_dir"
110 test_expect_success 'pulling changes from origin' \
111 'cd D &&
112 git pull origin'
114 cd "$base_dir"
116 # the 5 local objects are expected; file3 blob, commit in A to add it
117 # and its tree, and 2 are our tree and the merge commit.
118 test_expect_success 'check objects expected to exist locally' \
119 'cd D &&
120 echo "5 objects" > expected &&
121 git count-objects | cut -d, -f1 > current &&
122 test_cmp expected current'
124 cd "$base_dir"
126 test_expect_success 'preparing alternate repository #1' \
127 'test_create_repo F && cd F &&
128 echo first > file1 &&
129 git add file1 &&
130 git commit -m initial'
132 cd "$base_dir"
134 test_expect_success 'cloning alternate repo #2 and adding changes to repo #1' \
135 'git clone F G && cd F &&
136 echo second > file2 &&
137 git add file2 &&
138 git commit -m addition'
140 cd "$base_dir"
142 test_expect_success 'cloning alternate repo #1, using #2 as reference' \
143 'git clone --reference G F H'
145 cd "$base_dir"
147 test_expect_success 'cloning with reference being subset of source (-l -s)' \
148 'git clone -l -s --reference A B E'
150 cd "$base_dir"
152 test_expect_success 'clone with reference from a tagged repository' '
154 cd A && git tag -a -m 'tagged' HEAD
155 ) &&
156 git clone --reference=A A I
159 test_expect_success 'prepare branched repository' '
160 git clone A J &&
162 cd J &&
163 git checkout -b other master^ &&
164 echo other >otherfile &&
165 git add otherfile &&
166 git commit -m other &&
167 git checkout master
171 rm -f "$U.K"
173 test_expect_success 'fetch with incomplete alternates' '
174 git init K &&
175 echo "$base_dir/A/.git/objects" >K/.git/objects/info/alternates &&
177 cd K &&
178 git remote add J "file://$base_dir/J" &&
179 GIT_TRACE_PACKET=$U.K git fetch J
180 ) &&
181 master_object=$(cd A && git for-each-ref --format="%(objectname)" refs/heads/master) &&
182 test -s "$U.K" &&
183 ! grep " want $master_object" "$U.K" &&
184 tag_object=$(cd A && git for-each-ref --format="%(objectname)" refs/tags/HEAD) &&
185 ! grep " want $tag_object" "$U.K"
188 test_expect_success 'clone using repo with gitfile as a reference' '
189 git clone --separate-git-dir=L A M &&
190 git clone --reference=M A N &&
191 echo "$base_dir/L/objects" >expected &&
192 test_cmp expected "$base_dir/N/.git/objects/info/alternates"
195 test_expect_success 'clone using repo pointed at by gitfile as reference' '
196 git clone --reference=M/.git A O &&
197 echo "$base_dir/L/objects" >expected &&
198 test_cmp expected "$base_dir/O/.git/objects/info/alternates"
201 test_expect_success 'clone and dissociate from reference' '
202 git init P &&
204 cd P && test_commit one
205 ) &&
206 git clone P Q &&
208 cd Q && test_commit two
209 ) &&
210 git clone --no-local --reference=P Q R &&
211 git clone --no-local --reference=P --dissociate Q S &&
212 # removing the reference P would corrupt R but not S
213 rm -fr P &&
214 test_must_fail git -C R fsck &&
215 git -C S fsck
218 test_done