summaryrefslogtreecommitdiff
path: root/t/t4100/t-apply-8.expect
diff options
context:
space:
mode:
authorLibravatar Max Kirillov <max@max630.net>2018-07-10 22:17:48 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-11 09:35:41 -0700
commitb33fdfc34cda95f92cc7a50e5c81b87f8ee65eef (patch)
treedd902336f607c413310baae3d40bf51d158081cd /t/t4100/t-apply-8.expect
parentGit 2.18 (diff)
downloadtgif-b33fdfc34cda95f92cc7a50e5c81b87f8ee65eef.tar.xz
unpack-trees: do not fail reset because of unmerged skipped entry
After modify/delete merge conflict happens in a file skipped by sparse checkout, "git reset --merge", which implements the "--abort" actions, and "git reset --hard" fail with message "Entry * not uptodate. Cannot update sparse checkout." As explained in [1], the up-to-date checker mistakenly treats conflicted entry which does not exist in HEAD as still skipped by sparse checkout. Use the fix suggested in [1]. Also, add test case which verifies the issue is fixed. [1] https://public-inbox.org/git/20180616051444.GA29754@duynguyen.home/ Signed-off-by: Duy Nguyen <pclouds@gmail.com> Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4100/t-apply-8.expect')
0 files changed, 0 insertions, 0 deletions