undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unpack-trees: be specific what part of the index has changed

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2014-06-13 19:19:30 +07:00 committed by Junio C Hamano
parent 6c306a34ee
commit a5c446f116
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
unpack-trees.c
View File

@ -246,7 +246,9 @@ static int verify_absent_sparse(const struct cache_entry *ce,
enum unpack_trees_error_types, enum unpack_trees_error_types,
struct unpack_trees_options *o); struct unpack_trees_options *o);
static int apply_sparse_checkout(struct cache_entry *ce, struct unpack_trees_options *o) static int apply_sparse_checkout(struct index_state *istate,
struct cache_entry *ce,
struct unpack_trees_options *o)
{ {
int was_skip_worktree = ce_skip_worktree(ce); int was_skip_worktree = ce_skip_worktree(ce);
@ -254,6 +256,8 @@ static int apply_sparse_checkout(struct cache_entry *ce, struct unpack_trees_opt
ce->ce_flags |= CE_SKIP_WORKTREE; ce->ce_flags |= CE_SKIP_WORKTREE;
else else
ce->ce_flags &= ~CE_SKIP_WORKTREE; ce->ce_flags &= ~CE_SKIP_WORKTREE;
if (was_skip_worktree != ce_skip_worktree(ce))
istate->cache_changed |= CE_ENTRY_CHANGED;
/* /*
* if (!was_skip_worktree && !ce_skip_worktree()) { * if (!was_skip_worktree && !ce_skip_worktree()) {
@ -1131,7 +1135,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
ret = -1; ret = -1;
} }
if (apply_sparse_checkout(ce, o)) { if (apply_sparse_checkout(&o->result, ce, o)) {
if (!o->show_all_errors) if (!o->show_all_errors)
goto return_failed; goto return_failed;
ret = -1; ret = -1;