upload-pack: move allow_unadvertised_object_request to upload_pack_data

[thirdparty/git.git] / t / t6046-merge-skip-unneeded-updates.sh

diff --git a/t/t6046-merge-skip-unneeded-updates.sh b/t/t6046-merge-skip-unneeded-updates.sh
index b7e46698321588f21b942fb6aac7316fafc2206f..1ddc9e6626b8a369fbc15dd74aaf845d53be91e9 100755 (executable)
--- a/t/t6046-merge-skip-unneeded-updates.sh
+++ b/t/t6046-merge-skip-unneeded-updates.sh
@@ -71,16 +71,15 @@ test_expect_success '1a-L: Modify(A)/Modify(B), change on B subset of A' '
 
                git checkout A^0 &&
 
-               test-tool chmtime =31337 b &&
-               test-tool chmtime -v +0 b >expected-mtime &&
+               test-tool chmtime --get -3600 b >old-mtime &&
 
                GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-               test_i18ngrep "Skipped b" out &&
                test_must_be_empty err &&
 
-               test-tool chmtime -v +0 b >actual-mtime &&
-               test_cmp expected-mtime actual-mtime &&
+               # Make sure b was NOT updated
+               test-tool chmtime --get b >new-mtime &&
+               test_cmp old-mtime new-mtime &&
 
                git ls-files -s >index_files &&
                test_line_count = 1 index_files &&
@@ -102,9 +101,13 @@ test_expect_success '1a-R: Modify(A)/Modify(B), change on B subset of A' '
 
                git checkout B^0 &&
 
+               test-tool chmtime --get -3600 b >old-mtime &&
                GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
-               test_i18ngrep "Auto-merging b" out &&
+               # Make sure b WAS updated
+               test-tool chmtime --get b >new-mtime &&
+               test $(cat old-mtime) -lt $(cat new-mtime) &&
+
                test_must_be_empty err &&
 
                git ls-files -s >index_files &&
@@ -165,10 +168,10 @@ test_expect_success '2a-L: Modify/rename, merge into modify side' '
 
                git checkout A^0 &&
 
+               test_path_is_missing c &&
                GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-               test_i18ngrep ! "Skipped c" out &&
-               test_must_be_empty err &&
+               test_path_is_file c &&
 
                git ls-files -s >index_files &&
                test_line_count = 1 index_files &&
@@ -193,9 +196,13 @@ test_expect_success '2a-R: Modify/rename, merge into rename side' '
 
                git checkout B^0 &&
 
+               test-tool chmtime --get -3600 c >old-mtime &&
                GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
-               test_i18ngrep ! "Skipped c" out &&
+               # Make sure c WAS updated
+               test-tool chmtime --get c >new-mtime &&
+               test $(cat old-mtime) -lt $(cat new-mtime) &&
+
                test_must_be_empty err &&
 
                git ls-files -s >index_files &&
@@ -256,16 +263,14 @@ test_expect_success '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A' '
 
                git checkout A^0 &&
 
-               test-tool chmtime =31337 c &&
-               test-tool chmtime -v +0 c >expected-mtime &&
-
+               test-tool chmtime --get -3600 c >old-mtime &&
                GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-               test_i18ngrep "Skipped c" out &&
                test_must_be_empty err &&
 
-               test-tool chmtime -v +0 c >actual-mtime &&
-               test_cmp expected-mtime actual-mtime &&
+               # Make sure c WAS updated
+               test-tool chmtime --get c >new-mtime &&
+               test_cmp old-mtime new-mtime &&
 
                git ls-files -s >index_files &&
                test_line_count = 1 index_files &&
@@ -290,9 +295,12 @@ test_expect_success '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A' '
 
                git checkout B^0 &&
 
+               test_path_is_missing c &&
                GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
-               test_i18ngrep "Auto-merging c" out &&
+               # Make sure c now present (and thus was updated)
+               test_path_is_file c &&
+
                test_must_be_empty err &&
 
                git ls-files -s >index_files &&
@@ -361,13 +369,17 @@ test_expect_success '2c: Modify b & add c VS rename b->c' '
 
                git checkout A^0 &&
 
+               test-tool chmtime --get -3600 c >old-mtime &&
                GIT_MERGE_VERBOSITY=3 &&
                export GIT_MERGE_VERBOSITY &&
                test_must_fail git merge -s recursive B^0 >out 2>err &&
 
                test_i18ngrep "CONFLICT (rename/add): Rename b->c" out &&
-               test_i18ngrep ! "Skipped c" out &&
-               test_must_be_empty err
+               test_must_be_empty err &&
+
+               # Make sure c WAS updated
+               test-tool chmtime --get c >new-mtime &&
+               test $(cat old-mtime) -lt $(cat new-mtime)
 
                # FIXME: rename/add conflicts are horribly broken right now;
                # when I get back to my patch series fixing it and
@@ -460,11 +472,13 @@ test_expect_success '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 
                git checkout A^0 &&
 
+               test_path_is_missing bar/bq &&
                GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-               test_i18ngrep ! "Skipped bar/bq" out &&
                test_must_be_empty err &&
 
+               test_path_is_file bar/bq &&
+
                git ls-files -s >index_files &&
                test_line_count = 2 index_files &&
 
@@ -488,11 +502,13 @@ test_expect_success '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 
                git checkout B^0 &&
 
+               test_path_is_missing bar/bq &&
                GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
 
-               test_i18ngrep ! "Skipped bar/bq" out &&
                test_must_be_empty err &&
 
+               test_path_is_file bar/bq &&
+
                git ls-files -s >index_files &&
                test_line_count = 2 index_files &&
 
@@ -552,11 +568,13 @@ test_expect_success '3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 
                git checkout A^0 &&
 
+               test_path_is_missing bar/bq &&
                GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-               test_i18ngrep ! "Skipped bar/bq" out &&
                test_must_be_empty err &&
 
+               test_path_is_file bar/bq &&
+
                git ls-files -s >index_files &&
                test_line_count = 2 index_files &&
 
@@ -580,11 +598,13 @@ test_expect_success '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 
                git checkout B^0 &&
 
+               test_path_is_missing bar/bq &&
                GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
 
-               test_i18ngrep ! "Skipped bar/bq" out &&
                test_must_be_empty err &&
 
+               test_path_is_file bar/bq &&
+
                git ls-files -s >index_files &&
                test_line_count = 2 index_files &&
 
@@ -654,16 +674,15 @@ test_expect_failure '4a: Change on A, change on B subset of A, dirty mods presen
                git checkout A^0 &&
                echo "File rewritten" >b &&
 
-               test-tool chmtime =31337 b &&
-               test-tool chmtime -v +0 b >expected-mtime &&
+               test-tool chmtime --get -3600 b >old-mtime &&
 
                GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-               test_i18ngrep "Skipped b" out &&
                test_must_be_empty err &&
 
-               test-tool chmtime -v +0 b >actual-mtime &&
-               test_cmp expected-mtime actual-mtime &&
+               # Make sure b was NOT updated
+               test-tool chmtime --get b >new-mtime &&
+               test_cmp old-mtime new-mtime &&
 
                git ls-files -s >index_files &&
                test_line_count = 1 index_files &&
@@ -722,16 +741,15 @@ test_expect_success '4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mo
                git checkout A^0 &&
                echo "File rewritten" >c &&
 
-               test-tool chmtime =31337 c &&
-               test-tool chmtime -v +0 c >expected-mtime &&
+               test-tool chmtime --get -3600 c >old-mtime &&
 
                GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-               test_i18ngrep "Skipped c" out &&
                test_must_be_empty err &&
 
-               test-tool chmtime -v +0 c >actual-mtime &&
-               test_cmp expected-mtime actual-mtime &&
+               # Make sure c was NOT updated
+               test-tool chmtime --get c >new-mtime &&
+               test_cmp old-mtime new-mtime &&
 
                git ls-files -s >index_files &&
                test_line_count = 1 index_files &&