diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-08-27 22:54:28 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-08-27 22:54:28 +0400 |
commit | 3b753148b636be9dc821feebf85cd7f1739b07a1 (patch) | |
tree | e8b95caaf57039b797a844f429806df177a1bde4 /builtin/cat-file.c | |
parent | b9148c37637347cea7b448b57caeb2c58fe64979 (diff) | |
parent | c479d14a80743b1cb86d77695607f4c81f7d8797 (diff) |
Merge branch 'jk/maint-null-in-trees'
We do not want a link to 0{40} object stored anywhere in our objects.
* jk/maint-null-in-trees:
fsck: detect null sha1 in tree entries
do not write null sha1s to on-disk index
diff: do not use null sha1 as a sentinel value
Diffstat (limited to 'builtin/cat-file.c')
-rw-r--r-- | builtin/cat-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c index af74e775a1..0eca2d7bd0 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -146,7 +146,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name) die("git cat-file --textconv %s: <object> must be <sha1:path>", obj_name); - if (!textconv_object(obj_context.path, obj_context.mode, sha1, &buf, &size)) + if (!textconv_object(obj_context.path, obj_context.mode, sha1, 1, &buf, &size)) die("git cat-file --textconv: unable to run textconv on %s", obj_name); break; |