diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-04-11 13:09:56 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 13:09:56 +0900 |
commit | 27f25845cf5ebcfd214c16b9d9b53200980dfef8 (patch) | |
tree | 2262c73076e035bb96adc61e43221779ae3d5cbd /t/t7508-status.sh | |
parent | Merge branch 'sb/packfiles-in-repository' (diff) | |
parent | t/helper: merge test-write-cache into test-tool (diff) | |
download | tgif-27f25845cf5ebcfd214c16b9d9b53200980dfef8.tar.xz |
Merge branch 'nd/combined-test-helper'
Small test-helper programs have been consolidated into a single
binary.
* nd/combined-test-helper: (36 commits)
t/helper: merge test-write-cache into test-tool
t/helper: merge test-wildmatch into test-tool
t/helper: merge test-urlmatch-normalization into test-tool
t/helper: merge test-subprocess into test-tool
t/helper: merge test-submodule-config into test-tool
t/helper: merge test-string-list into test-tool
t/helper: merge test-strcmp-offset into test-tool
t/helper: merge test-sigchain into test-tool
t/helper: merge test-sha1-array into test-tool
t/helper: merge test-scrap-cache-tree into test-tool
t/helper: merge test-run-command into test-tool
t/helper: merge test-revision-walking into test-tool
t/helper: merge test-regex into test-tool
t/helper: merge test-ref-store into test-tool
t/helper: merge test-read-cache into test-tool
t/helper: merge test-prio-queue into test-tool
t/helper: merge test-path-utils into test-tool
t/helper: merge test-online-cpus into test-tool
t/helper: merge test-mktemp into test-tool
t/helper: merge (unused) test-mergesort into test-tool
...
Diffstat (limited to 't/t7508-status.sh')
-rwxr-xr-x | t/t7508-status.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh index 50052e2872..7afadb175a 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -1672,12 +1672,12 @@ test_expect_success '"Initial commit" should not be noted in commit template' ' ' test_expect_success '--no-optional-locks prevents index update' ' - test-chmtime =1234567890 .git/index && + test-tool chmtime =1234567890 .git/index && git --no-optional-locks status && - test-chmtime -v +0 .git/index >out && + test-tool chmtime -v +0 .git/index >out && grep ^1234567890 out && git status && - test-chmtime -v +0 .git/index >out && + test-tool chmtime -v +0 .git/index >out && ! grep ^1234567890 out ' |