mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/checkout-noisy'

Browse Source 
"git checkout [<tree-ish>] path..." learned to report the number of
paths that have been checked out of the index or the tree-ish,
which gives it the same degree of noisy-ness as the case in which
the command checks out a branch.

* nd/checkout-noisy:
  t0027: squelch checkout path run outside test_expect_* block
  checkout: print something when checking out paths
This commit is contained in:
Junio C Hamano
2019-01-14 15:29:28 -08:00
parent d4c9027021 774d44cc18
commit 4084df42c2
8 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unpack-trees.c
View File

@ -294,7 +294,7 @@ static void load_gitmodules_file(struct index_state *index,
repo_read_gitmodules(the_repository);
} else if (state && (ce->ce_flags & CE_UPDATE)) {
submodule_free(the_repository);
checkout_entry(ce, state, NULL);
checkout_entry(ce, state, NULL, NULL);
repo_read_gitmodules(the_repository);
}
}
@ -450,12 +450,12 @@ static int check_updates(struct unpack_trees_options *o)
display_progress(progress, ++cnt);
ce->ce_flags &= ~CE_UPDATE;
if (o->update && !o->dry_run) {
errs |= checkout_entry(ce, &state, NULL);
errs |= checkout_entry(ce, &state, NULL, NULL);
}
}
}
stop_progress(&progress);
errs |= finish_delayed_checkout(&state);
errs |= finish_delayed_checkout(&state, NULL);
if (o->update)
git_attr_set_direction(GIT_ATTR_CHECKIN);