diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:24:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:24:54 -0700 |
| commit | 03adeeaad6c039aadda074de9509f4d845739d55 (patch) | |
| tree | 826dba3c67172a391714d5d804dff638844e8025 /Documentation/git-update-index.txt | |
| parent | 423a9e28fc144624437cb00ce853b741891ae623 (diff) | |
| parent | c479d14a80743b1cb86d77695607f4c81f7d8797 (diff) | |
| download | git-03adeeaad6c039aadda074de9509f4d845739d55.tar.gz | |
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 'Documentation/git-update-index.txt')
0 files changed, 0 insertions, 0 deletions