@matheusbsbs / matheus-bagliano / commits / 7d782416cb

unpack-trees: don't update files with CE_WT_REMOVE set

Don't update files in the worktree from cache entries which are flagged with CE_WT_REMOVE. When a user does a sparse checkout, git removes files that are marked with CE_WT_REMOVE (because they are out-of-scope for the sparse checkout). If those files are also marked CE_UPDATE (for instance, because they differ in the branch that is being checked out and the outgoing branch), git would previously recreate them. This patch prevents them from being recreated. These erroneously-created files would also interfere with merges, causing pre-merge revisions of out-of-scope files to appear in the worktree. apply_sparse_checkout() is the function where all "action" manipulation (add, delete, update files..) for sparse checkout occurs; it should not ask to delete and update both at the same time. Signed-off-by: Anatole Shaw <git-devel@omni.poc.net> Signed-off-by: David Turner <dturner@twopensource.com> Helped-by: Duy Nguyen <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

David Turner committed Jul 17, 2015 at 17:19 UTC 7d782416cb5176d93a073bee8048163db544c80f
2 files changed +56
t/t1090-sparse-checkout-scope.sh new
+52
@@ -0,0 +1,52 @@
1 +#!/bin/sh
2 +
3 +test_description='sparse checkout scope tests'
4 +
5 +. ./test-lib.sh
6 +
7 +test_expect_success 'setup' '
8 + echo "initial" >a &&
9 + echo "initial" >b &&
10 + echo "initial" >c &&
11 + git add a b c &&
12 + git commit -m "initial commit"
13 +'
14 +
15 +test_expect_success 'create feature branch' '
16 + git checkout -b feature &&
17 + echo "modified" >b &&
18 + echo "modified" >c &&
19 + git add b c &&
20 + git commit -m "modification"
21 +'
22 +
23 +test_expect_success 'perform sparse checkout of master' '
24 + git config --local --bool core.sparsecheckout true &&
25 + echo "!/*" >.git/info/sparse-checkout &&
26 + echo "/a" >>.git/info/sparse-checkout &&
27 + echo "/c" >>.git/info/sparse-checkout &&
28 + git checkout master &&
29 + test_path_is_file a &&
30 + test_path_is_missing b &&
31 + test_path_is_file c
32 +'
33 +
34 +test_expect_success 'merge feature branch into sparse checkout of master' '
35 + git merge feature &&
36 + test_path_is_file a &&
37 + test_path_is_missing b &&
38 + test_path_is_file c &&
39 + test "$(cat c)" = "modified"
40 +'
41 +
42 +test_expect_success 'return to full checkout of master' '
43 + git checkout feature &&
44 + echo "/*" >.git/info/sparse-checkout &&
45 + git checkout master &&
46 + test_path_is_file a &&
47 + test_path_is_file b &&
48 + test_path_is_file c &&
49 + test "$(cat b)" = "modified"
50 +'
51 +
52 +test_done
unpack-trees.c
+4
@@ -227,6 +227,9 @@ static int check_updates(struct unpack_trees_options *o)
227 struct cache_entry *ce = index->cache[i];
228
229 if (ce->ce_flags & CE_UPDATE) {
230 + if (ce->ce_flags & CE_WT_REMOVE)
231 + die("BUG: both update and delete flags are set on %s",
232 + ce->name);
233 display_progress(progress, ++cnt);
234 ce->ce_flags &= ~CE_UPDATE;
235 if (o->update && !o->dry_run) {
@@ -290,6 +293,7 @@ static int apply_sparse_checkout(struct cache_entry *ce, struct unpack_trees_opt
293 if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o))
294 return -1;
295 ce->ce_flags |= CE_WT_REMOVE;
296 + ce->ce_flags &= ~CE_UPDATE;
297 }
298 if (was_skip_worktree && !ce_skip_worktree(ce)) {
299 if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))