diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-13 19:22:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-13 19:22:21 (GMT) |
| commit | 6845e8a62dca508819e9a95b9269054de8c7eda8 (patch) | |
| tree | 3366596d645ff95ceb25bc3025fa1a83cad4b361 /t | |
| parent | ebba6c0ca617352ceef5caa636ab243f0ef14cc3 (diff) | |
| parent | 6554dfa97af92a159231d94e60403bfe0d6e8e61 (diff) | |
| download | git-6845e8a62dca508819e9a95b9269054de8c7eda8.zip git-6845e8a62dca508819e9a95b9269054de8c7eda8.tar.gz git-6845e8a62dca508819e9a95b9269054de8c7eda8.tar.bz2 | |
Merge branch 'jk/cat-file-regression-fix' into maint
"git cat-file --batch=", an admittedly useless command, did not
behave very well.
* jk/cat-file-regression-fix:
cat-file: handle --batch format with missing type/size
cat-file: pass expand_data to print_object_or_die
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1006-cat-file.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh index 8a1bc5c..1687098 100755 --- a/t/t1006-cat-file.sh +++ b/t/t1006-cat-file.sh @@ -85,6 +85,28 @@ $content" git cat-file --batch-check="%(objecttype) %(rest)" >actual && test_cmp expect actual ' + + test -z "$content" || + test_expect_success "--batch without type ($type)" ' + { + echo "$size" && + maybe_remove_timestamp "$content" $no_ts + } >expect && + echo $sha1 | git cat-file --batch="%(objectsize)" >actual.full && + maybe_remove_timestamp "$(cat actual.full)" $no_ts >actual && + test_cmp expect actual + ' + + test -z "$content" || + test_expect_success "--batch without size ($type)" ' + { + echo "$type" && + maybe_remove_timestamp "$content" $no_ts + } >expect && + echo $sha1 | git cat-file --batch="%(objecttype)" >actual.full && + maybe_remove_timestamp "$(cat actual.full)" $no_ts >actual && + test_cmp expect actual + ' } hello_content="Hello World" |