summaryrefslogtreecommitdiff
path: root/copy.c
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2010-07-31 13:14:29 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-09 12:16:02 -0700
commit74da98f9c761b2e63366a643fa52749844ddc6a1 (patch)
tree41d872160ae1685c296973a6825a4636bb3b90c3 /copy.c
parentunpack-trees: do not check for conflict entries too early (diff)
downloadtgif-74da98f9c761b2e63366a643fa52749844ddc6a1.tar.xz
unpack-trees: mark new entries skip-worktree appropriately
Sparse checkout narrows worktree down based on the skip-worktree bit before and after $GIT_DIR/info/sparse-checkout application. If it does not have that bit before but does after, a narrow is detected and the file will be removed from worktree. New files added by merge, however, does not have skip-worktree bit. If those files appear to be outside checkout area, the same rule applies: the file gets removed from worktree even though they don't exist in worktree. Just pretend they have skip-worktree before in that case, so the rule is ignored. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'copy.c')
0 files changed, 0 insertions, 0 deletions