diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-14 23:29:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 23:29:29 (GMT) |
| commit | 4084df42c26bfd1ff192abf9807a648d89cc81ab (patch) | |
| tree | 23c52f617af81887d1a0a26bb5d31612fd47010c /builtin/difftool.c | |
| parent | d4c90270215ba5600ca9cab69185da2027bbf892 (diff) | |
| parent | 774d44cc18fe23e384b14535df00f4ef2995f8dd (diff) | |
| download | git-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 'builtin/difftool.c')
| -rw-r--r-- | builtin/difftool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index 544b0e8..71318c2 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -323,7 +323,7 @@ static int checkout_path(unsigned mode, struct object_id *oid, int ret; ce = make_transient_cache_entry(mode, oid, path, 0); - ret = checkout_entry(ce, state, NULL); + ret = checkout_entry(ce, state, NULL, NULL); discard_cache_entry(ce); return ret; |