summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff_--cached
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-09-09 13:53:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-09 13:53:09 -0700
commit0df670bc0b8b5499859829ba0889ce96a75304a6 (patch)
treee95738e380852775d16806643a57ece2d4d39461 /t/t4013/diff.diff_--cached
parentMerge branch 'js/ci-squelch-false-failure' (diff)
parentwt-status: tolerate dangling marks (diff)
downloadtgif-0df670bc0b8b5499859829ba0889ce96a75304a6.tar.xz
Merge branch 'jt/interpret-branch-name-fallback'
"git status" has trouble showing where it came from by interpreting reflog entries that recordcertain events, e.g. "checkout @{u}", and gives a hard/fatal error. Even though it inherently is impossible to give a correct answer because the reflog entries lose some information (e.g. "@{u}" does not record what branch the user was on hence which branch 'the upstream' needs to be computed, and even if the record were available, the relationship between branches may have changed), at least hide the error to allow "status" show its output. * jt/interpret-branch-name-fallback: wt-status: tolerate dangling marks refs: move dwim_ref() to header file sha1-name: replace unsigned int with option struct
Diffstat (limited to 't/t4013/diff.diff_--cached')
0 files changed, 0 insertions, 0 deletions