diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-27 20:54:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-27 20:54:28 +0200 |
| commit | 3b753148b636be9dc821feebf85cd7f1739b07a1 (patch) | |
| tree | e8b95caaf57039b797a844f429806df177a1bde4 /diffcore.h | |
| parent | Merge branch 'mm/push-default-switch-warning' (diff) | |
| parent | fsck: detect null sha1 in tree entries (diff) | |
| download | git-3b753148b636be9dc821feebf85cd7f1739b07a1.tar.xz git-3b753148b636be9dc821feebf85cd7f1739b07a1.zip | |
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 'diffcore.h')
| -rw-r--r-- | diffcore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore.h b/diffcore.h index be0739c5c4..1c16c8595b 100644 --- a/diffcore.h +++ b/diffcore.h @@ -55,7 +55,7 @@ struct diff_filespec { extern struct diff_filespec *alloc_filespec(const char *); extern void free_filespec(struct diff_filespec *); extern void fill_filespec(struct diff_filespec *, const unsigned char *, - unsigned short); + int, unsigned short); extern int diff_populate_filespec(struct diff_filespec *, int); extern void diff_free_filespec_data(struct diff_filespec *); |