diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 15:29:29 -0800 |
| commit | 4084df42c26bfd1ff192abf9807a648d89cc81ab (patch) | |
| tree | 23c52f617af81887d1a0a26bb5d31612fd47010c /t | |
| parent | Merge branch 'ab/commit-graph-progress-fix' (diff) | |
| parent | t0027: squelch checkout path run outside test_expect_* block (diff) | |
| download | tgif-4084df42c26bfd1ff192abf9807a648d89cc81ab.tar.xz | |
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 't')
| -rwxr-xr-x | t/t0027-auto-crlf.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh index beb5927f77..3587e454f1 100755 --- a/t/t0027-auto-crlf.sh +++ b/t/t0027-auto-crlf.sh @@ -293,9 +293,9 @@ checkout_files () { do rm crlf_false_attr__$f.txt && if test -z "$ceol"; then - git checkout crlf_false_attr__$f.txt + git checkout -- crlf_false_attr__$f.txt else - git -c core.eol=$ceol checkout crlf_false_attr__$f.txt + git -c core.eol=$ceol checkout -- crlf_false_attr__$f.txt fi done |