-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy patht7900-subtree.sh
executable file
·1034 lines (973 loc) · 34.1 KB
/
t7900-subtree.sh
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
#!/bin/sh
#
# Copyright (c) 2012 Avery Pennaraum
# Copyright (c) 2015 Alexey Shumkin
#
test_description='Basic porcelain support for subtrees
This test verifies the basic operation of the add, pull, merge
and split subcommands of git subtree.
'
TEST_DIRECTORY=$(pwd)/../../../t
export TEST_DIRECTORY
. ../../../t/test-lib.sh
subtree_test_create_repo()
{
test_create_repo "$1" &&
(
cd "$1" &&
git config log.date relative
)
}
create()
{
echo "$1" >"$1" &&
git add "$1"
}
check_equal()
{
test_debug 'echo'
test_debug "echo \"check a:\" \"{$1}\""
test_debug "echo \" b:\" \"{$2}\""
if [ "$1" = "$2" ]; then
return 0
else
return 1
fi
}
undo()
{
git reset --hard HEAD~
}
# Make sure no patch changes more than one file.
# The original set of commits changed only one file each.
# A multi-file change would imply that we pruned commits
# too aggressively.
join_commits()
{
commit=
all=
while read x y; do
if [ -z "$x" ]; then
continue
elif [ "$x" = "commit:" ]; then
if [ -n "$commit" ]; then
echo "$commit $all"
all=
fi
commit="$y"
else
all="$all $y"
fi
done
echo "$commit $all"
}
test_create_commit() (
repo=$1 &&
commit=$2 &&
cd "$repo" &&
mkdir -p "$(dirname "$commit")" \
|| error "Could not create directory for commit"
echo "$commit" >"$commit" &&
git add "$commit" || error "Could not add commit"
git commit -m "$commit" || error "Could not commit"
)
last_commit_message()
{
git log --pretty=format:%s -1
}
subtree_test_count=0
next_test() {
subtree_test_count=$(($subtree_test_count+1))
}
#
# Tests for 'git subtree add'
#
next_test
test_expect_success 'no merge from non-existent subtree' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
test_must_fail git subtree merge --prefix="sub dir" FETCH_HEAD
)
'
next_test
test_expect_success 'no pull from non-existent subtree' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
test_must_fail git subtree pull --prefix="sub dir" ./"sub proj" master
)'
next_test
test_expect_success 'add subproj as subtree into sub dir/ with --prefix' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD &&
check_equal "$(last_commit_message)" "Add '\''sub dir/'\'' from commit '\''$(git rev-parse FETCH_HEAD)'\''"
)
'
next_test
test_expect_success 'add subproj as subtree into sub dir/ with --prefix and --message' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" --message="Added subproject" FETCH_HEAD &&
check_equal "$(last_commit_message)" "Added subproject"
)
'
next_test
test_expect_success 'add subproj as subtree into sub dir/ with --prefix as -P and --message as -m' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add -P "sub dir" -m "Added subproject" FETCH_HEAD &&
check_equal "$(last_commit_message)" "Added subproject"
)
'
next_test
test_expect_success 'add subproj as subtree into sub dir/ with --squash and --prefix and --message' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" --message="Added subproject with squash" --squash FETCH_HEAD &&
check_equal "$(last_commit_message)" "Added subproject with squash"
)
'
#
# Tests for 'git subtree merge'
#
next_test
test_expect_success 'merge new subproj history into sub dir/ with --prefix' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
)
'
next_test
test_expect_success 'merge new subproj history into sub dir/ with --prefix and --message' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" --message="Merged changes from subproject" FETCH_HEAD &&
check_equal "$(last_commit_message)" "Merged changes from subproject"
)
'
next_test
test_expect_success 'merge new subproj history into sub dir/ with --squash and --prefix and --message' '
subtree_test_create_repo "$subtree_test_count/sub proj" &&
subtree_test_create_repo "$subtree_test_count" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" --message="Merged changes from subproject using squash" --squash FETCH_HEAD &&
check_equal "$(last_commit_message)" "Merged changes from subproject using squash"
)
'
next_test
test_expect_success 'merge the added subproj again, should do nothing' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD &&
# this shouldn not actually do anything, since FETCH_HEAD
# is already a parent
result=$(git merge -s ours -m "merge -s -ours" FETCH_HEAD) &&
check_equal "${result}" "Already up to date."
)
'
next_test
test_expect_success 'merge new subproj history into subdir/ with a slash appended to the argument of --prefix' '
test_create_repo "$test_count" &&
test_create_repo "$test_count/subproj" &&
test_create_commit "$test_count" main1 &&
test_create_commit "$test_count/subproj" sub1 &&
(
cd "$test_count" &&
git fetch ./subproj master &&
git subtree add --prefix=subdir/ FETCH_HEAD
) &&
test_create_commit "$test_count/subproj" sub2 &&
(
cd "$test_count" &&
git fetch ./subproj master &&
git subtree merge --prefix=subdir/ FETCH_HEAD &&
check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
)
'
#
# Tests for 'git subtree split'
#
next_test
test_expect_success 'split requires option --prefix' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD &&
echo "You must provide the --prefix option." > expected &&
test_must_fail git subtree split > actual 2>&1 &&
test_debug "printf '"expected: "'" &&
test_debug "cat expected" &&
test_debug "printf '"actual: "'" &&
test_debug "cat actual" &&
test_cmp expected actual
)
'
next_test
test_expect_success 'split requires path given by option --prefix must exist' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD &&
echo "'\''non-existent-directory'\'' does not exist; use '\''git subtree add'\''" > expected &&
test_must_fail git subtree split --prefix=non-existent-directory > actual 2>&1 &&
test_debug "printf '"expected: "'" &&
test_debug "cat expected" &&
test_debug "printf '"actual: "'" &&
test_debug "cat actual" &&
test_cmp expected actual
)
'
next_test
test_expect_success 'split sub dir/ with --rejoin' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
git subtree split --prefix="sub dir" --annotate="*" --rejoin &&
check_equal "$(last_commit_message)" "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
)
'
next_test
test_expect_success 'split sub dir/ with --rejoin from scratch' '
subtree_test_create_repo "$subtree_test_count" &&
test_create_commit "$subtree_test_count" main1 &&
(
cd "$subtree_test_count" &&
mkdir "sub dir" &&
echo file >"sub dir"/file &&
git add "sub dir/file" &&
git commit -m"sub dir file" &&
split_hash=$(git subtree split --prefix="sub dir" --rejoin) &&
git subtree split --prefix="sub dir" --rejoin &&
check_equal "$(last_commit_message)" "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
)
'
next_test
test_expect_success 'split sub dir/ with --rejoin and --message' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
git subtree split --prefix="sub dir" --message="Split & rejoin" --annotate="*" --rejoin &&
check_equal "$(last_commit_message)" "Split & rejoin"
)
'
next_test
test_expect_success 'split "sub dir"/ with --branch' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br &&
check_equal "$(git rev-parse subproj-br)" "$split_hash"
)
'
next_test
test_expect_success 'check hash of split' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br &&
check_equal "$(git rev-parse subproj-br)" "$split_hash" &&
# Check hash of split
new_hash=$(git rev-parse subproj-br^2) &&
(
cd ./"sub proj" &&
subdir_hash=$(git rev-parse HEAD) &&
check_equal ''"$new_hash"'' "$subdir_hash"
)
)
'
next_test
test_expect_success 'split "sub dir"/ with --branch for an existing branch' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git branch subproj-br FETCH_HEAD &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br &&
check_equal "$(git rev-parse subproj-br)" "$split_hash"
)
'
next_test
test_expect_success 'split "sub dir"/ with --branch for an incompatible branch' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git branch init HEAD &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
test_must_fail git subtree split --prefix="sub dir" --branch init
)
'
#
# Validity checking
#
next_test
test_expect_success 'make sure exactly the right set of files ends up in the subproj' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
test_create_commit "$subtree_test_count/sub proj" sub3 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
(
cd "$subtree_test_count/sub proj" &&
git fetch .. subproj-br &&
git merge FETCH_HEAD
) &&
test_create_commit "$subtree_test_count/sub proj" sub4 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub4 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
(
cd "$subtree_test_count/sub proj" &&
git fetch .. subproj-br &&
git merge FETCH_HEAD &&
test_write_lines main-sub1 main-sub2 main-sub3 main-sub4 \
sub1 sub2 sub3 sub4 >expect &&
git ls-files >actual &&
test_cmp expect actual
)
'
next_test
test_expect_success 'make sure the subproj *only* contains commits that affect the "sub dir"' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
test_create_commit "$subtree_test_count/sub proj" sub3 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
(
cd "$subtree_test_count/sub proj" &&
git fetch .. subproj-br &&
git merge FETCH_HEAD
) &&
test_create_commit "$subtree_test_count/sub proj" sub4 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub4 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
(
cd "$subtree_test_count/sub proj" &&
git fetch .. subproj-br &&
git merge FETCH_HEAD &&
test_write_lines main-sub1 main-sub2 main-sub3 main-sub4 \
sub1 sub2 sub3 sub4 >expect &&
git log --name-only --pretty=format:"" >log &&
sort <log | sed "/^\$/ d" >actual &&
test_cmp expect actual
)
'
next_test
test_expect_success 'make sure exactly the right set of files ends up in the mainline' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
test_create_commit "$subtree_test_count/sub proj" sub3 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
(
cd "$subtree_test_count/sub proj" &&
git fetch .. subproj-br &&
git merge FETCH_HEAD
) &&
test_create_commit "$subtree_test_count/sub proj" sub4 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub4 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
(
cd "$subtree_test_count/sub proj" &&
git fetch .. subproj-br &&
git merge FETCH_HEAD
) &&
(
cd "$subtree_test_count" &&
git subtree pull --prefix="sub dir" ./"sub proj" master &&
test_write_lines main1 main2 >chkm &&
test_write_lines main-sub1 main-sub2 main-sub3 main-sub4 >chkms &&
sed "s,^,sub dir/," chkms >chkms_sub &&
test_write_lines sub1 sub2 sub3 sub4 >chks &&
sed "s,^,sub dir/," chks >chks_sub &&
cat chkm chkms_sub chks_sub >expect &&
git ls-files >actual &&
test_cmp expect actual
)
'
next_test
test_expect_success 'make sure each filename changed exactly once in the entire history' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git config log.date relative &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
test_create_commit "$subtree_test_count/sub proj" sub3 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
(
cd "$subtree_test_count/sub proj" &&
git fetch .. subproj-br &&
git merge FETCH_HEAD
) &&
test_create_commit "$subtree_test_count/sub proj" sub4 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub4 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
(
cd "$subtree_test_count/sub proj" &&
git fetch .. subproj-br &&
git merge FETCH_HEAD
) &&
(
cd "$subtree_test_count" &&
git subtree pull --prefix="sub dir" ./"sub proj" master &&
test_write_lines main1 main2 >chkm &&
test_write_lines sub1 sub2 sub3 sub4 >chks &&
test_write_lines main-sub1 main-sub2 main-sub3 main-sub4 >chkms &&
sed "s,^,sub dir/," chkms >chkms_sub &&
# main-sub?? and /"sub dir"/main-sub?? both change, because those are the
# changes that were split into their own history. And "sub dir"/sub?? never
# change, since they were *only* changed in the subtree branch.
git log --name-only --pretty=format:"" >log &&
sort <log >sorted-log &&
sed "/^$/ d" sorted-log >actual &&
cat chkms chkm chks chkms_sub >expect-unsorted &&
sort expect-unsorted >expect &&
test_cmp expect actual
)
'
next_test
test_expect_success 'make sure the --rejoin commits never make it into subproj' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
test_create_commit "$subtree_test_count/sub proj" sub3 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
(
cd "$subtree_test_count/sub proj" &&
git fetch .. subproj-br &&
git merge FETCH_HEAD
) &&
test_create_commit "$subtree_test_count/sub proj" sub4 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub4 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
(
cd "$subtree_test_count/sub proj" &&
git fetch .. subproj-br &&
git merge FETCH_HEAD
) &&
(
cd "$subtree_test_count" &&
git subtree pull --prefix="sub dir" ./"sub proj" master &&
check_equal "$(git log --pretty=format:"%s" HEAD^2 | grep -i split)" ""
)
'
next_test
test_expect_success 'make sure no "git subtree" tagged commits make it into subproj' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
test_create_commit "$subtree_test_count/sub proj" sub3 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
(
cd "$subtree_test_count/sub proj" &&
git fetch .. subproj-br &&
git merge FETCH_HEAD
) &&
test_create_commit "$subtree_test_count/sub proj" sub4 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub4 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
) &&
(
cd "$subtree_test_count/sub proj" &&
git fetch .. subproj-br &&
git merge FETCH_HEAD
) &&
(
cd "$subtree_test_count" &&
git subtree pull --prefix="sub dir" ./"sub proj" master &&
# They are meaningless to subproj since one side of the merge refers to the mainline
check_equal "$(git log --pretty=format:"%s%n%b" HEAD^2 | grep "git-subtree.*:")" ""
)
'
#
# A new set of tests
#
next_test
test_expect_success 'make sure "git subtree split" find the correct parent' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git branch subproj-ref FETCH_HEAD &&
git subtree merge --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --branch subproj-br &&
# at this point, the new commit parent should be subproj-ref, if it is
# not, something went wrong (the "newparent" of "master~" commit should
# have been sub2, but it was not, because its cache was not set to
# itself)
check_equal "$(git log --pretty=format:%P -1 subproj-br)" "$(git rev-parse subproj-ref)"
)
'
next_test
test_expect_success 'split a new subtree without --onto option' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --branch subproj-br
) &&
mkdir "$subtree_test_count"/"sub dir2" &&
test_create_commit "$subtree_test_count" "sub dir2"/main-sub2 &&
(
cd "$subtree_test_count" &&
# also test that we still can split out an entirely new subtree
# if the parent of the first commit in the tree is not empty,
# then the new subtree has accidentally been attached to something
git subtree split --prefix="sub dir2" --branch subproj2-br &&
check_equal "$(git log --pretty=format:%P -1 subproj2-br)" ""
)
'
next_test
test_expect_success 'verify one file change per commit' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git branch sub1 FETCH_HEAD &&
git subtree add --prefix="sub dir" sub1
) &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir" --branch subproj-br
) &&
mkdir "$subtree_test_count"/"sub dir2" &&
test_create_commit "$subtree_test_count" "sub dir2"/main-sub2 &&
(
cd "$subtree_test_count" &&
git subtree split --prefix="sub dir2" --branch subproj2-br &&
x= &&
git log --pretty=format:"commit: %H" | join_commits |
(
while read commit a b; do
test_debug "echo Verifying commit $commit"
test_debug "echo a: $a"
test_debug "echo b: $b"
check_equal "$b" ""
x=1
done
check_equal "$x" 1
)
)
'
next_test
test_expect_success 'push split to subproj' '
subtree_test_create_repo "$subtree_test_count" &&
subtree_test_create_repo "$subtree_test_count/sub proj" &&
test_create_commit "$subtree_test_count" main1 &&
test_create_commit "$subtree_test_count/sub proj" sub1 &&
(
cd "$subtree_test_count" &&
git fetch ./"sub proj" master &&
git subtree add --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
test_create_commit "$subtree_test_count" main2 &&
test_create_commit "$subtree_test_count/sub proj" sub2 &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
(
cd $subtree_test_count/"sub proj" &&
git branch sub-branch-1 &&
cd .. &&
git fetch ./"sub proj" master &&
git subtree merge --prefix="sub dir" FETCH_HEAD
) &&
test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
(
cd "$subtree_test_count" &&
git subtree push ./"sub proj" --prefix "sub dir" sub-branch-1 &&
cd ./"sub proj" &&
git checkout sub-branch-1 &&
check_equal "$(last_commit_message)" "sub dir/main-sub3"
)
'
#
# This test covers 2 cases in subtree split copy_or_skip code
# 1) Merges where one parent is a superset of the changes of the other
# parent regarding changes to the subtree, in this case the merge
# commit should be copied
# 2) Merges where only one parent operate on the subtree, and the merge
# commit should be skipped
#
# (1) is checked by ensuring subtree_tip is a descendent of subtree_branch
# (2) should have a check added (not_a_subtree_change shouldn't be present
# on the produced subtree)
#
# Other related cases which are not tested (or currently handled correctly)
# - Case (1) where there are more than 2 parents, it will sometimes correctly copy
# the merge, and sometimes not
# - Merge commit where both parents have same tree as the merge, currently
# will always be skipped, even if they reached that state via different
# set of commits.
#
next_test
test_expect_success 'subtree descendant check' '
subtree_test_create_repo "$subtree_test_count" &&
test_create_commit "$subtree_test_count" folder_subtree/a &&
(
cd "$subtree_test_count" &&
git branch branch