forked from git-for-windows/git
-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a '--sparse' option flag to the pack-objects builtin. This allows the user to specify that they want to use the new logic for walking trees. This logic currently does not differ from the existing output, but will in a later change. Create a new test script, t5322-pack-objects-sparse.sh, to ensure the object list that is selected matches what we expect. When we update the logic to walk in a sparse fashion, the final test will be updated to show the extra objects that are added. Signed-off-by: Derrick Stolee <[email protected]>
- Loading branch information
1 parent
39dc89b
commit ab733da
Showing
3 changed files
with
129 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| #!/bin/sh | ||
|
|
||
| test_description='pack-objects object selection using sparse algorithm' | ||
| . ./test-lib.sh | ||
|
|
||
| test_expect_success 'setup repo' ' | ||
| test_commit initial && | ||
| for i in $(test_seq 1 3) | ||
| do | ||
| mkdir f$i && | ||
| for j in $(test_seq 1 3) | ||
| do | ||
| mkdir f$i/f$j && | ||
| echo $j >f$i/f$j/data.txt | ||
| done | ||
| done && | ||
| git add . && | ||
| git commit -m "Initialized trees" && | ||
| for i in $(test_seq 1 3) | ||
| do | ||
| git checkout -b topic$i master && | ||
| echo change-$i >f$i/f$i/data.txt && | ||
| git commit -a -m "Changed f$i/f$i/data.txt" | ||
| done && | ||
| cat >packinput.txt <<-EOF && | ||
| topic1 | ||
| ^topic2 | ||
| ^topic3 | ||
| EOF | ||
| git rev-parse \ | ||
| topic1 \ | ||
| topic1^{tree} \ | ||
| topic1:f1 \ | ||
| topic1:f1/f1 \ | ||
| topic1:f1/f1/data.txt | sort >expect_objects.txt | ||
| ' | ||
|
|
||
| test_expect_success 'non-sparse pack-objects' ' | ||
| git pack-objects --stdout --revs <packinput.txt >nonsparse.pack && | ||
| git index-pack -o nonsparse.idx nonsparse.pack && | ||
| git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt && | ||
| test_cmp expect_objects.txt nonsparse_objects.txt | ||
| ' | ||
|
|
||
| test_expect_success 'sparse pack-objects' ' | ||
| git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack && | ||
| git index-pack -o sparse.idx sparse.pack && | ||
| git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt && | ||
| test_cmp expect_objects.txt sparse_objects.txt | ||
| ' | ||
|
|
||
| # Demonstrate that both algorithms send "extra" objects because | ||
| # they are not in the frontier. | ||
|
|
||
| test_expect_success 'duplicate a folder from f3 and commit to topic1' ' | ||
| git checkout topic1 && | ||
| echo change-3 >f3/f3/data.txt && | ||
| git commit -a -m "Changed f3/f3/data.txt" && | ||
| git rev-parse \ | ||
| topic1~1 \ | ||
| topic1~1^{tree} \ | ||
| topic1^{tree} \ | ||
| topic1 \ | ||
| topic1:f1 \ | ||
| topic1:f1/f1 \ | ||
| topic1:f1/f1/data.txt \ | ||
| topic1:f3 \ | ||
| topic1:f3/f3 \ | ||
| topic1:f3/f3/data.txt | sort >expect_objects.txt | ||
| ' | ||
|
|
||
| test_expect_success 'non-sparse pack-objects' ' | ||
| git pack-objects --stdout --revs <packinput.txt >nonsparse.pack && | ||
| git index-pack -o nonsparse.idx nonsparse.pack && | ||
| git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt && | ||
| test_cmp expect_objects.txt nonsparse_objects.txt | ||
| ' | ||
|
|
||
| test_expect_success 'sparse pack-objects' ' | ||
| git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack && | ||
| git index-pack -o sparse.idx sparse.pack && | ||
| git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt && | ||
| test_cmp expect_objects.txt sparse_objects.txt | ||
| ' | ||
|
|
||
| test_expect_success 'duplicate a folder from f1 into f3' ' | ||
| mkdir f3/f4 && | ||
| cp -r f1/f1/* f3/f4 && | ||
| git add f3/f4 && | ||
| git commit -m "Copied f1/f1 to f3/f4" && | ||
| cat >packinput.txt <<-EOF && | ||
| topic1 | ||
| ^topic1~1 | ||
| EOF | ||
| git rev-parse \ | ||
| topic1 \ | ||
| topic1^{tree} \ | ||
| topic1:f3 | sort >expect_objects.txt | ||
| ' | ||
|
|
||
| test_expect_success 'non-sparse pack-objects' ' | ||
| git pack-objects --stdout --revs <packinput.txt >nonsparse.pack && | ||
| git index-pack -o nonsparse.idx nonsparse.pack && | ||
| git show-index <nonsparse.idx | awk "{print \$2}" >nonsparse_objects.txt && | ||
| test_cmp expect_objects.txt nonsparse_objects.txt | ||
| ' | ||
|
|
||
| test_expect_success 'sparse pack-objects' ' | ||
| git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack && | ||
| git index-pack -o sparse.idx sparse.pack && | ||
| git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt && | ||
| test_cmp expect_objects.txt sparse_objects.txt | ||
| ' | ||
|
|
||
| test_done |