diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:38 -0700 |
| commit | 218608cacd478bfdf4bfe40ed7d0b11af94a6a60 (patch) | |
| tree | c30026405afe95aa26fd0003387e00afe05f17d5 /t/t5536-fetch-conflicts.sh | |
| parent | Fourth batch for 2.19 cycle (diff) | |
| parent | has_uncommitted_changes(): fall back to empty tree (diff) | |
| download | tgif-218608cacd478bfdf4bfe40ed7d0b11af94a6a60.tar.xz | |
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
Diffstat (limited to 't/t5536-fetch-conflicts.sh')
0 files changed, 0 insertions, 0 deletions