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 /Documentation | |
| 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 'Documentation')
| -rw-r--r-- | Documentation/git-hash-object.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt index 02c1f12685..0c75f3b610 100644 --- a/Documentation/git-hash-object.txt +++ b/Documentation/git-hash-object.txt @@ -9,7 +9,7 @@ git-hash-object - Compute object ID and optionally creates a blob from a file SYNOPSIS -------- [verse] -'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] <file>... +'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin [--literally]] [--] <file>... 'git hash-object' [-t <type>] [-w] --stdin-paths [--no-filters] < <list-of-paths> DESCRIPTION @@ -51,7 +51,13 @@ OPTIONS Hash the contents as is, ignoring any input filter that would have been chosen by the attributes mechanism, including the end-of-line conversion. If the file is read from standard input then this - is always implied, unless the --path option is given. + is always implied, unless the `--path` option is given. + +--literally:: + Allow `--stdin` to hash any garbage into a loose object which might not + otherwise pass standard object parsing or git-fsck checks. Useful for + stress-testing Git itself or reproducing characteristics of corrupt or + bogus objects encountered in the wild. GIT --- |