summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-14 23:29:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-14 23:29:29 (GMT)
commit4084df42c26bfd1ff192abf9807a648d89cc81ab (patch)
tree23c52f617af81887d1a0a26bb5d31612fd47010c /apply.c
parentd4c90270215ba5600ca9cab69185da2027bbf892 (diff)
parent774d44cc18fe23e384b14535df00f4ef2995f8dd (diff)
downloadgit-4084df42c26bfd1ff192abf9807a648d89cc81ab.zip
git-4084df42c26bfd1ff192abf9807a648d89cc81ab.tar.gz
git-4084df42c26bfd1ff192abf9807a648d89cc81ab.tar.bz2
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
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index 01793d6..3703bfc 100644
--- a/apply.c
+++ b/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;
}