t6022, t6046: test expected behavior instead of testing a proxy for it

[thirdparty/git.git] / t / t6022-merge-rename.sh

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 6f196aaf276d329b22aebe647144d25f01747bba..d97cf48495b3bbe8d9fe28a7d8f2b53f4769ecc2 100755 (executable)
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -242,12 +242,23 @@ test_expect_success 'merge of identical changes in a renamed file' '
        rm -f A M N &&
        git reset --hard &&
        git checkout change+rename &&
+
+       test-tool chmtime =31337 B &&
+       test-tool chmtime --get B >old-mtime &&
        GIT_MERGE_VERBOSITY=3 git merge change >out &&
-       test_i18ngrep "^Skipped B" out &&
+
+       test-tool chmtime --get B >new-mtime &&
+       test_cmp old-mtime new-mtime &&
+
        git reset --hard HEAD^ &&
        git checkout change &&
+
+       test-tool chmtime =-1 M &&
+       test-tool chmtime --get M >old-mtime &&
        GIT_MERGE_VERBOSITY=3 git merge change+rename >out &&
-       test_i18ngrep ! "^Skipped B" out
+
+       test-tool chmtime --get B >new-mtime &&
+       test $(cat old-mtime) -lt $(cat new-mtime)
 '
 
 test_expect_success 'setup for rename + d/f conflicts' '