diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-07-31 13:14:29 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-09 12:16:02 -0700 |
| commit | 74da98f9c761b2e63366a643fa52749844ddc6a1 (patch) | |
| tree | 41d872160ae1685c296973a6825a4636bb3b90c3 /t | |
| parent | unpack-trees: do not check for conflict entries too early (diff) | |
| download | tgif-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 't')
| -rwxr-xr-x | t/t1011-read-tree-sparse-checkout.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh index 85e08374dd..9a07de1a5b 100755 --- a/t/t1011-read-tree-sparse-checkout.sh +++ b/t/t1011-read-tree-sparse-checkout.sh @@ -146,7 +146,7 @@ test_expect_success 'read-tree adds to worktree, absent case' ' test ! -f sub/added ' -test_expect_failure 'read-tree adds to worktree, dirty case' ' +test_expect_success 'read-tree adds to worktree, dirty case' ' echo init.t >.git/info/sparse-checkout && git checkout -f removed && mkdir sub && |