Merge branch 'nd/checkout-noisy'
"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:
3
apply.c
3
apply.c
@ -3352,7 +3352,8 @@ static int checkout_target(struct index_state *istate,
|
||||
|
||||
costate.refresh_cache = 1;
|
||||
costate.istate = istate;
|
||||
if (checkout_entry(ce, &costate, NULL) || lstat(ce->name, st))
|
||||
if (checkout_entry(ce, &costate, NULL, NULL) ||
|
||||
lstat(ce->name, st))
|
||||
return error(_("cannot checkout %s"), ce->name);
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user