diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-27 11:54:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-27 11:54:28 -0700 |
| commit | 3b753148b636be9dc821feebf85cd7f1739b07a1 (patch) | |
| tree | e8b95caaf57039b797a844f429806df177a1bde4 /diff-no-index.c | |
| parent | b9148c37637347cea7b448b57caeb2c58fe64979 (diff) | |
| parent | c479d14a80743b1cb86d77695607f4c81f7d8797 (diff) | |
| download | git-3b753148b636be9dc821feebf85cd7f1739b07a1.tar.gz | |
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 'diff-no-index.c')
| -rw-r--r-- | diff-no-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-no-index.c b/diff-no-index.c index b34b5aa7df..74da659368 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -82,7 +82,7 @@ static struct diff_filespec *noindex_filespec(const char *name, int mode) if (!name) name = "/dev/null"; s = alloc_filespec(name); - fill_filespec(s, null_sha1, mode); + fill_filespec(s, null_sha1, 0, mode); if (name == file_from_standard_input) populate_from_stdin(s); return s; |