Here is a re-roll-up since I haven't received any additional corrections for
almost a week. The changes are very slight and just for clean-up so it is ready
to be promoted to master.
This is the interdiff from last time:
diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
index 510d3537f..d9dccf4d4 100755
--- a/t/t5317-pack-objects-filter-objects.sh
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -69,7 +69,7 @@ test_expect_success 'get an error for missing tree object' '
test_must_fail git -C r5 pack-objects --rev --stdout 2>bad_tree <<-EOF &&
HEAD
EOF
- grep -q "bad tree object" bad_tree
+ grep "bad tree object" bad_tree
'
test_expect_success 'setup for tests of tree:0' '
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 53fbf7db8..392caa08f 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -192,7 +192,7 @@ test_expect_success 'use fsck before and after manually fetching a missing subtr
xargs -n1 git -C dst cat-file -t >fetched_types &&
sort -u fetched_types >unique_types.observed &&
- printf "blob\ncommit\ntree\n" >unique_types.expected &&
+ test_write_lines blob commit tree >unique_types.expected &&
test_cmp unique_types.expected unique_types.observed
'
diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
index c8e3d87c4..08e0c7db6 100755
--- a/t/t6112-rev-list-filters-objects.sh
+++ b/t/t6112-rev-list-filters-objects.sh
@@ -38,8 +38,8 @@ test_expect_success 'specify blob explicitly prevents filtering' '
awk -f print_2.awk) &&
git -C r1 rev-list --objects --filter=blob:none HEAD $file_3 >observed &&
- grep -q "$file_3" observed &&
- test_must_fail grep -q "$file_4" observed
+ grep "$file_3" observed &&
+ ! grep "$file_4" observed
'
test_expect_success 'verify emitted+omitted == all' '
@@ -240,7 +240,7 @@ test_expect_success 'verify tree:0 includes trees in "filtered" output' '
xargs -n1 git -C r3 cat-file -t >unsorted_filtered_types &&
sort -u unsorted_filtered_types >filtered_types &&
- printf "blob\ntree\n" >expected &&
+ test_write_lines blob tree >expected &&
test_cmp expected filtered_types
'
Thanks,
Matthew DeVore (8):
list-objects: store common func args in struct
list-objects: refactor to process_tree_contents
list-objects: always parse trees gently
rev-list: handle missing tree objects properly
revision: mark non-user-given objects instead
list-objects-filter: use BUG rather than die
list-objects-filter-options: do not over-strbuf_init
list-objects-filter: implement filter tree:0
Documentation/rev-list-options.txt | 5 +
builtin/rev-list.c | 11 +-
list-objects-filter-options.c | 19 +-
list-objects-filter-options.h | 1 +
list-objects-filter.c | 60 ++++++-
list-objects.c | 232 +++++++++++++------------
revision.c | 1 -
revision.h | 26 ++-
t/t0410-partial-clone.sh | 45 +++++
t/t5317-pack-objects-filter-objects.sh | 41 +++++
t/t5616-partial-clone.sh | 42 +++++
t/t6112-rev-list-filters-objects.sh | 49 ++++++
12 files changed, 404 insertions(+), 128 deletions(-)
--
2.19.1.331.ge82ca0e54c-goog
