t3427: simplify the `setup` test case significantly
It still does the very same thing as before, but expresses it in a much more succinct (and still quite readable) manner. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jul 31, 2019 at 08:18 UTC
c248d32cdb302812585823231cf29027db33571e
1 file changed
+15
-21
t/t3427-rebase-subtree.sh
+15
-21
@@ -41,27 +41,21 @@ commit_message() {
41
42
test_expect_success 'setup' '
43
test_commit README &&
44
- mkdir files &&
45
- (
46
- cd files &&
47
- git init &&
48
- test_commit master1 &&
49
- test_commit master2 &&
50
- test_commit master3
51
- ) &&
52
- git fetch files master &&
53
- git branch files-master FETCH_HEAD &&
54
- git read-tree --prefix=files_subtree files-master &&
55
- git checkout -- files_subtree &&
56
- tree=$(git write-tree) &&
57
- head=$(git rev-parse HEAD) &&
58
- rev=$(git rev-parse --verify files-master^0) &&
59
- commit=$(git commit-tree -p $head -p $rev -m "Add subproject master" $tree) &&
60
- git update-ref HEAD $commit &&
61
- (
62
- cd files_subtree &&
63
- test_commit master4
64
- ) &&
44
+
45
+ git init files &&
46
+ test_commit -C files master1 &&
47
+ test_commit -C files master2 &&
48
+ test_commit -C files master3 &&
49
+
50
+ : perform subtree merge into files_subtree/ &&
51
+ git fetch files refs/heads/master:refs/heads/files-master &&
52
+ git merge -s ours --no-commit --allow-unrelated-histories \
53
+ files-master &&
54
+ git read-tree --prefix=files_subtree -u files-master &&
55
+ git commit -m "Add subproject master" &&
56
+
57
+ : add two extra commits to rebase &&
58
+ test_commit -C files_subtree master4 &&
59
test_commit files_subtree/master5
60
'
61