diff options
| author |  Taylor Blau <me@ttaylorr.com> | 2019-04-09 19:13:19 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-10 12:59:39 +0900 |
| commit | b49e74eac480d167c3af8f1286fe520c3d7ce9e1 (patch) | |
| tree | ae973ee4c011fb9e7d82c86c2e809b735272d9bf /t/t6102-rev-list-unexpected-objects.sh | |
| parent | list-objects.c: handle unexpected non-blob entries (diff) | |
| download | tgif-b49e74eac480d167c3af8f1286fe520c3d7ce9e1.tar.xz | |
list-objects.c: handle unexpected non-tree entries
Apply similar treatment as the previous commit for non-tree entries,
too.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6102-rev-list-unexpected-objects.sh')
| -rwxr-xr-x | t/t6102-rev-list-unexpected-objects.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t6102-rev-list-unexpected-objects.sh b/t/t6102-rev-list-unexpected-objects.sh index 1377c60378..e3ec195532 100755 --- a/t/t6102-rev-list-unexpected-objects.sh +++ b/t/t6102-rev-list-unexpected-objects.sh @@ -34,8 +34,9 @@ test_expect_failure 'traverse unexpected non-tree entry (lone)' ' test_must_fail git rev-list --objects $broken_tree ' -test_expect_failure 'traverse unexpected non-tree entry (seen)' ' - test_must_fail git rev-list --objects $blob $broken_tree +test_expect_success 'traverse unexpected non-tree entry (seen)' ' + test_must_fail git rev-list --objects $blob $broken_tree >output 2>&1 && + test_i18ngrep "is not a tree" output ' test_expect_success 'setup unexpected non-commit parent' ' |