diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 00:24:53 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 00:24:54 +0200 |
| commit | 03adeeaad6c039aadda074de9509f4d845739d55 (patch) | |
| tree | 826dba3c67172a391714d5d804dff638844e8025 /diffcore-rename.c | |
| parent | Merge branch 'tr/maint-send-email-2047' into maint-1.7.11 (diff) | |
| parent | fsck: detect null sha1 in tree entries (diff) | |
| download | git-03adeeaad6c039aadda074de9509f4d845739d55.tar.xz git-03adeeaad6c039aadda074de9509f4d845739d55.zip | |
Merge branch 'jk/maint-null-in-trees' into maint-1.7.11
"git diff" had a confusion between taking data from a path in the
working tree and taking data from an object that happens to have
name 0{40} recorded in a tree.
* 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-rename.c')
| -rw-r--r-- | diffcore-rename.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index 216a7a4bbc..512d0ac5fd 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -48,7 +48,7 @@ static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two, memmove(rename_dst + first + 1, rename_dst + first, (rename_dst_nr - first - 1) * sizeof(*rename_dst)); rename_dst[first].two = alloc_filespec(two->path); - fill_filespec(rename_dst[first].two, two->sha1, two->mode); + fill_filespec(rename_dst[first].two, two->sha1, two->sha1_valid, two->mode); rename_dst[first].pair = NULL; return &(rename_dst[first]); } |