| commit | 218608cacd478bfdf4bfe40ed7d0b11af94a6a60 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Aug 2018 22:30:37 +0000 (2 15:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Aug 2018 22:30:38 +0000 (2 15:30 -0700) | ||
| tree | c30026405afe95aa26fd0003387e00afe05f17d5 | treesnapshot (tar.gz zip) |
| parent | ffc6fa0e396238de3a30623912980263b4f283ab | commitdiff |
| parent | 3506dc944558b7d88544408b312e795458383195 | commitdiff |
Merge branch 'jk/has-uncommitted-changes-fix'
"git pull --rebase" on a corrupt HEAD caused a segfault. In
general we substitute an empty tree object when running the in-core
equivalent of the diff-index command, and the codepath has been
corrected to do so as well to fix this issue.
* jk/has-uncommitted-changes-fix:
has_uncommitted_changes(): fall back to empty tree
"git pull --rebase" on a corrupt HEAD caused a segfault. In
general we substitute an empty tree object when running the in-core
equivalent of the diff-index command, and the codepath has been
corrected to do so as well to fix this issue.
* jk/has-uncommitted-changes-fix:
has_uncommitted_changes(): fall back to empty tree
| diff-lib.c | diff1 | diff2 | blobhistory |
| wt-status.c | diff1 | diff2 | blobhistory |