diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-11 07:09:56 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-11 07:09:56 +0300 |
| commit | 27f25845cf5ebcfd214c16b9d9b53200980dfef8 (patch) | |
| tree | 2262c73076e035bb96adc61e43221779ae3d5cbd /t/t3501-revert-cherry-pick.sh | |
| parent | 3a1ec60c43b1cad73fed8040aed7117900e9fd9d (diff) | |
| parent | c81f843d0901c79150b1bf2fe528ad0c48267c24 (diff) | |
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/t3501-revert-cherry-pick.sh')
| -rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 0d89f6d0f6..c9a1f783f5 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -86,7 +86,7 @@ test_expect_success 'cherry-pick on stat-dirty working tree' ' ( cd copy && git checkout initial && - test-chmtime +40 oops && + test-tool chmtime +40 oops && git cherry-pick added ) ' |