sha1-file.c: mark more strings for translation
[gitweb.git] / t / t3501-revert-cherry-pick.sh
index 4f2a263b63e14348032959059c15b160fecba39c..d1c68af8c50e75255baa618ea297549b548c0fc2 100755 (executable)
@@ -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
        )
 '
@@ -150,7 +150,9 @@ test_expect_success 'cherry-pick works with dirty renamed file' '
        test_tick &&
        git commit -m renamed &&
        echo modified >renamed &&
-       git cherry-pick refs/heads/unrelated
+       git cherry-pick refs/heads/unrelated >out &&
+       test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) &&
+       grep -q "^modified$" renamed
 '
 
 test_done