summaryrefslogtreecommitdiff
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2022-01-14 15:59:39 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-01-14 14:42:20 -0800
commitb3df8c982a1bfb21b7803ca01d72951966505fb2 (patch)
treeb74f13b764ab123a5b02e32279014a4ff9644484 /merge-blobs.h
parentMerge branch 'vd/sparse-clean-etc' into en/present-despite-skipped (diff)
downloadtgif-b3df8c982a1bfb21b7803ca01d72951966505fb2.tar.xz
t1011: add testcase demonstrating accidental loss of user modifications
If a user has a file with local modifications that is not marked as SKIP_WORKTREE, but the sparsity patterns are such that it should be marked that way, and the user then invokes a command like * git checkout -q HEAD^ or * git read-tree -mu HEAD^ Then the file will be deleted along with all the users' modifications. Add a testcase demonstrating this problem. Note: This bug only triggers if something other than 'HEAD' is given; if the commands above had specified 'HEAD', then the users' file would be left alone. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions