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 /revision.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 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/revision.c b/revision.c index 57eb0c0e13..442a945233 100644 --- a/revision.c +++ b/revision.c @@ -345,6 +345,7 @@ static int tree_difference = REV_TREE_SAME; static void file_add_remove(struct diff_options *options, int addremove, unsigned mode, const unsigned char *sha1, + int sha1_valid, const char *fullpath, unsigned dirty_submodule) { int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD; @@ -358,6 +359,7 @@ static void file_change(struct diff_options *options, unsigned old_mode, unsigned new_mode, const unsigned char *old_sha1, const unsigned char *new_sha1, + int old_sha1_valid, int new_sha1_valid, const char *fullpath, unsigned old_dirty_submodule, unsigned new_dirty_submodule) { |