global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

t/helper: merge test-chmtime into test-tool

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-03-24 08:44:31 +01:00
committed by Junio C Hamano
parent efd71f8913
commit 0e496492d2
33 changed files with 94 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t3418-rebase-continue.sh
View File

@@ -24,7 +24,7 @@ test_expect_success 'interactive rebase --continue works with touched file' '
git checkout master &&
FAKE_LINES="edit 1" git rebase -i HEAD^ &&
test-chmtime =-60 F1 &&
test-tool chmtime =-60 F1 &&
git rebase --continue
'
@@ -36,7 +36,7 @@ test_expect_success 'non-interactive rebase --continue works with touched file'
test_must_fail git rebase --onto master master topic &&
echo "Resolved" >F2 &&
git add F2 &&
test-chmtime =-60 F1 &&
test-tool chmtime =-60 F1 &&
git rebase --continue
'