diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-08-05 11:10:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-08-05 11:10:51 -0700 |
| commit | f072d0e4a270c9e0afb0f02a1de37daf5a277138 (patch) | |
| tree | 64894c840f452744812b5eb14eaea65d5028f004 /t/t4013/diff.diff_initial..side | |
| parent | 7a403c3ee5519770b2630b49a59eba7815c8c210 (diff) | |
| parent | 447126ed7df66b396235766547a57649f925aac2 (diff) | |
Merge branch 'jk/diff-relative-cached-unmerged'
'git diff --relative' running with '--cached' has been corrected to
avoid a segfault when encountering unmerged paths outside the
prefix.
* jk/diff-relative-cached-unmerged:
diff-lib: add idx/tree sanity check to oneway_diff
diff: ignore unmerged paths outside prefix with --relative --cached
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions
