summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-03-24 07:44:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-27 15:45:47 (GMT)
commit0e496492d26a8f7f360b6fad1aed2cae74403fa1 (patch)
tree8e46a524080c7a49b19b603932d1a3f833ad08e2 /t/t6022-merge-rename.sh
parentefd71f8913a876a0c333fa29382530d6abbc6164 (diff)
downloadgit-0e496492d26a8f7f360b6fad1aed2cae74403fa1.zip
git-0e496492d26a8f7f360b6fad1aed2cae74403fa1.tar.gz
git-0e496492d26a8f7f360b6fad1aed2cae74403fa1.tar.bz2
t/helper: merge test-chmtime into test-tool
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6022-merge-rename.sh')
-rwxr-xr-xt/t6022-merge-rename.sh30
1 files changed, 15 insertions, 15 deletions
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index c01f721..a1fad69 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -635,10 +635,10 @@ test_expect_success 'setup avoid unnecessary update, normal rename' '
test_expect_success 'avoid unnecessary update, normal rename' '
git checkout -q avoid-unnecessary-update-1^0 &&
- test-chmtime =1000000000 rename &&
- test-chmtime -v +0 rename >expect &&
+ test-tool chmtime =1000000000 rename &&
+ test-tool chmtime -v +0 rename >expect &&
git merge merge-branch-1 &&
- test-chmtime -v +0 rename >actual &&
+ test-tool chmtime -v +0 rename >actual &&
test_cmp expect actual # "rename" should have stayed intact
'
@@ -668,10 +668,10 @@ test_expect_success 'setup to test avoiding unnecessary update, with D/F conflic
test_expect_success 'avoid unnecessary update, with D/F conflict' '
git checkout -q avoid-unnecessary-update-2^0 &&
- test-chmtime =1000000000 df &&
- test-chmtime -v +0 df >expect &&
+ test-tool chmtime =1000000000 df &&
+ test-tool chmtime -v +0 df >expect &&
git merge merge-branch-2 &&
- test-chmtime -v +0 df >actual &&
+ test-tool chmtime -v +0 df >actual &&
test_cmp expect actual # "df" should have stayed intact
'
@@ -700,10 +700,10 @@ test_expect_success 'setup avoid unnecessary update, dir->(file,nothing)' '
test_expect_success 'avoid unnecessary update, dir->(file,nothing)' '
git checkout -q master^0 &&
- test-chmtime =1000000000 df &&
- test-chmtime -v +0 df >expect &&
+ test-tool chmtime =1000000000 df &&
+ test-tool chmtime -v +0 df >expect &&
git merge side &&
- test-chmtime -v +0 df >actual &&
+ test-tool chmtime -v +0 df >actual &&
test_cmp expect actual # "df" should have stayed intact
'
@@ -730,10 +730,10 @@ test_expect_success 'setup avoid unnecessary update, modify/delete' '
test_expect_success 'avoid unnecessary update, modify/delete' '
git checkout -q master^0 &&
- test-chmtime =1000000000 file &&
- test-chmtime -v +0 file >expect &&
+ test-tool chmtime =1000000000 file &&
+ test-tool chmtime -v +0 file >expect &&
test_must_fail git merge side &&
- test-chmtime -v +0 file >actual &&
+ test-tool chmtime -v +0 file >actual &&
test_cmp expect actual # "file" should have stayed intact
'
@@ -759,10 +759,10 @@ test_expect_success 'setup avoid unnecessary update, rename/add-dest' '
test_expect_success 'avoid unnecessary update, rename/add-dest' '
git checkout -q master^0 &&
- test-chmtime =1000000000 newfile &&
- test-chmtime -v +0 newfile >expect &&
+ test-tool chmtime =1000000000 newfile &&
+ test-tool chmtime -v +0 newfile >expect &&
git merge side &&
- test-chmtime -v +0 newfile >actual &&
+ test-tool chmtime -v +0 newfile >actual &&
test_cmp expect actual # "file" should have stayed intact
'