diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:49:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:49:25 -0700 |
| commit | 1e6c8babf86d8564104e159ce46df069c882a5af (patch) | |
| tree | f92f0c6616c662aa02ee4ede034bd5a05f70ba11 /t | |
| parent | Merge branch 'jk/rebase-quiet-noop' into maint (diff) | |
| parent | write_sha1_file(): do not use a separate sha1[] array (diff) | |
| download | tgif-1e6c8babf86d8564104e159ce46df069c882a5af.tar.xz | |
Merge branch 'jc/hash-object' into maint
"hash-object --literally" introduced in v2.2 was not prepared to
take a really long object type name.
* jc/hash-object:
write_sha1_file(): do not use a separate sha1[] array
t1007: add hash-object --literally tests
hash-object --literally: fix buffer overrun with extra-long object type
git-hash-object.txt: document --literally option
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1007-hash-object.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh index ebb3a69c8c..7d2baa15bb 100755 --- a/t/t1007-hash-object.sh +++ b/t/t1007-hash-object.sh @@ -209,4 +209,15 @@ test_expect_success 'hash-object complains about truncated type name' ' test_must_fail git hash-object -t bl --stdin </dev/null ' +test_expect_success '--literally' ' + t=1234567890 && + echo example | git hash-object -t $t --literally --stdin +' + +test_expect_success '--literally with extra-long type' ' + t=12345678901234567890123456789012345678901234567890 && + t="$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t$t" && + echo example | git hash-object -t $t --literally --stdin +' + test_done |