summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-11 21:23:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-11 21:23:59 (GMT)
commit051086b947ee7a6fdd5697889a225098f723761d (patch)
tree0920d85e5e97dad89618cf87307a3f4d0bf5abbe /Documentation
parentb9f5d3874f3406c820049b26fd7b10f7cae7138f (diff)
parent1427a7ff70bce0c1040831d5d674c83ebcda6d7d (diff)
downloadgit-051086b947ee7a6fdd5697889a225098f723761d.zip
git-051086b947ee7a6fdd5697889a225098f723761d.tar.gz
git-051086b947ee7a6fdd5697889a225098f723761d.tar.bz2
Merge branch 'jc/hash-object'
"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.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt
index 02c1f12..0c75f3b 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
---