{"thread":{"id":"898","subject":"[PATCH 1/3] Clean up read-tree two-way tests.","startedAt":"2005-06-11T01:34:34Z","lastAt":"2005-06-11T01:34:34Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"4843","messageId":"7vd5qt7k2d.fsf@assigned-by-dhcp.cox.net","threadId":"898","inReplyTo":null,"subject":"[PATCH 1/3] Clean up read-tree two-way tests.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-06-11T01:34:34Z","receivedAt":"2005-06-11T01:34:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This is in preparation for \"2-way fast-forward emulated with\n3-way mechanism\" series.  It does not change what the tests for\npure 2-way do.  It only changes how it tests things, to make\nreviewing of differences of the two tests easier in later steps.\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n---\n\n t/t1001-read-tree-m-2way.sh |   77 +++++++++++++++++++++++--------------------\n 1 files changed, 42 insertions(+), 35 deletions(-)\n\ndiff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh\n--- a/t/t1001-read-tree-m-2way.sh\n+++ b/t/t1001-read-tree-m-2way.sh\n@@ -22,12 +22,18 @@ In the test, these paths are used:\n '\n . ./test-lib.sh\n \n+read_tree_twoway () {\n+    git-read-tree -m \"$1\" \"$2\" && git-ls-files --stage\n+}\n+\n _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'\n _x40=\"$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40\"\n compare_change () {\n-\tsed >current \\\n+    \tcat current\n+\tsed -n >current \\\n \t    -e '/^--- /d; /^+++ /d; /^@@ /d;' \\\n-\t    -e 's/^\\(.[0-7][0-7][0-7][0-7][0-7][0-7]\\) '\"$_x40\"' /\\1 X /' \"$1\"\n+\t    -e 's/^\\([-+][0-7][0-7][0-7][0-7][0-7][0-7]\\) '\"$_x40\"' /\\1 X /p' \\\n+\t    \"$1\"\n \tdiff -u expected current\n }\n \n@@ -68,9 +74,9 @@ test_expect_success \\\n test_expect_success \\\n     '1, 2, 3 - no carry forward' \\\n     'rm -f .git/index &&\n-     git-read-tree -m $treeH $treeM &&\n+     read_tree_twoway $treeH $treeM &&\n      git-ls-files --stage >1-3.out &&\n-     cmp M.out 1-3.out &&\n+     diff -u M.out 1-3.out &&\n      check_cache_at bozbar dirty &&\n      check_cache_at frotz dirty &&\n      check_cache_at nitfol dirty'\n@@ -81,9 +87,9 @@ test_expect_success \\\n     '4 - carry forward local addition.' \\\n     'rm -f .git/index &&\n      git-update-cache --add yomin &&\n-     git-read-tree -m $treeH $treeM &&\n+     read_tree_twoway $treeH $treeM &&\n      git-ls-files --stage >4.out || exit\n-     diff --unified=0 M.out 4.out >4diff.out\n+     diff -u M.out 4.out >4diff.out\n      compare_change 4diff.out expected &&\n      check_cache_at yomin clean'\n \n@@ -93,9 +99,9 @@ test_expect_success \\\n      echo yomin >yomin &&\n      git-update-cache --add yomin &&\n      echo yomin yomin >yomin &&\n-     git-read-tree -m $treeH $treeM &&\n+     read_tree_twoway $treeH $treeM &&\n      git-ls-files --stage >5.out || exit\n-     diff --unified=0 M.out 5.out >5diff.out\n+     diff -u M.out 5.out >5diff.out\n      compare_change 5diff.out expected &&\n      check_cache_at yomin dirty'\n \n@@ -103,9 +109,9 @@ test_expect_success \\\n     '6 - local addition already has the same.' \\\n     'rm -f .git/index &&\n      git-update-cache --add frotz &&\n-     git-read-tree -m $treeH $treeM &&\n+     read_tree_twoway $treeH $treeM &&\n      git-ls-files --stage >6.out &&\n-     diff --unified=0 M.out 6.out &&\n+     diff -u M.out 6.out &&\n      check_cache_at frotz clean'\n \n test_expect_success \\\n@@ -114,9 +120,9 @@ test_expect_success \\\n      echo frotz >frotz &&\n      git-update-cache --add frotz &&\n      echo frotz frotz >frotz &&\n-     git-read-tree -m $treeH $treeM &&\n+     read_tree_twoway $treeH $treeM &&\n      git-ls-files --stage >7.out &&\n-     diff --unified=0 M.out 7.out &&\n+     diff -u M.out 7.out &&\n      check_cache_at frotz dirty'\n \n test_expect_success \\\n@@ -124,7 +130,7 @@ test_expect_success \\\n     'rm -f .git/index &&\n      echo frotz frotz >frotz &&\n      git-update-cache --add frotz &&\n-     if git-read-tree -m $treeH $treeM; then false; else :; fi'\n+     if read_tree_twoway $treeH $treeM; then false; else :; fi'\n \n test_expect_success \\\n     '9 - conflicting addition.' \\\n@@ -132,16 +138,16 @@ test_expect_success \\\n      echo frotz frotz >frotz &&\n      git-update-cache --add frotz &&\n      echo frotz >frotz &&\n-     if git-read-tree -m $treeH $treeM; then false; else :; fi'\n+     if read_tree_twoway $treeH $treeM; then false; else :; fi'\n \n test_expect_success \\\n     '10 - path removed.' \\\n     'rm -f .git/index &&\n      echo rezrov >rezrov &&\n      git-update-cache --add rezrov &&\n-     git-read-tree -m $treeH $treeM &&\n+     read_tree_twoway $treeH $treeM &&\n      git-ls-files --stage >10.out &&\n-     cmp M.out 10.out'\n+     diff -u M.out 10.out'\n \n test_expect_success \\\n     '11 - dirty path removed.' \\\n@@ -149,14 +155,14 @@ test_expect_success \\\n      echo rezrov >rezrov &&\n      git-update-cache --add rezrov &&\n      echo rezrov rezrov >rezrov &&\n-     if git-read-tree -m $treeH $treeM; then false; else :; fi'\n+     if read_tree_twoway $treeH $treeM; then false; else :; fi'\n \n test_expect_success \\\n     '12 - unmatching local changes being removed.' \\\n     'rm -f .git/index &&\n      echo rezrov rezrov >rezrov &&\n      git-update-cache --add rezrov &&\n-     if git-read-tree -m $treeH $treeM; then false; else :; fi'\n+     if read_tree_twoway $treeH $treeM; then false; else :; fi'\n \n test_expect_success \\\n     '13 - unmatching local changes being removed.' \\\n@@ -164,7 +170,7 @@ test_expect_success \\\n      echo rezrov rezrov >rezrov &&\n      git-update-cache --add rezrov &&\n      echo rezrov >rezrov &&\n-     if git-read-tree -m $treeH $treeM; then false; else :; fi'\n+     if read_tree_twoway $treeH $treeM; then false; else :; fi'\n \n cat >expected <<EOF\n -100644 X 0\tnitfol\n@@ -176,9 +182,9 @@ test_expect_success \\\n     'rm -f .git/index &&\n      echo nitfol nitfol >nitfol &&\n      git-update-cache --add nitfol &&\n-     git-read-tree -m $treeH $treeM &&\n+     read_tree_twoway $treeH $treeM &&\n      git-ls-files --stage >14.out || exit\n-     diff --unified=0 M.out 14.out >14diff.out\n+     diff -u M.out 14.out >14diff.out\n      compare_change 14diff.out expected &&\n      check_cache_at nitfol clean'\n \n@@ -188,9 +194,9 @@ test_expect_success \\\n      echo nitfol nitfol >nitfol &&\n      git-update-cache --add nitfol &&\n      echo nitfol nitfol nitfol >nitfol &&\n-     git-read-tree -m $treeH $treeM &&\n+     read_tree_twoway $treeH $treeM &&\n      git-ls-files --stage >15.out || exit\n-     diff --unified=0 M.out 15.out >15diff.out\n+     diff -u M.out 15.out >15diff.out\n      compare_change 15diff.out expected &&\n      check_cache_at nitfol dirty'\n \n@@ -199,7 +205,7 @@ test_expect_success \\\n     'rm -f .git/index &&\n      echo bozbar bozbar >bozbar &&\n      git-update-cache --add bozbar &&\n-     if git-read-tree -m $treeH $treeM; then false; else :; fi'\n+     if read_tree_twoway $treeH $treeM; then false; else :; fi'\n \n test_expect_success \\\n     '17 - conflicting local change.' \\\n@@ -207,16 +213,16 @@ test_expect_success \\\n      echo bozbar bozbar >bozbar &&\n      git-update-cache --add bozbar &&\n      echo bozbar bozbar bozbar >bozbar &&\n-     if git-read-tree -m $treeH $treeM; then false; else :; fi'\n+     if read_tree_twoway $treeH $treeM; then false; else :; fi'\n \n test_expect_success \\\n     '18 - local change already having a good result.' \\\n     'rm -f .git/index &&\n      echo gnusto >bozbar &&\n      git-update-cache --add bozbar &&\n-     git-read-tree -m $treeH $treeM &&\n+     read_tree_twoway $treeH $treeM &&\n      git-ls-files --stage >18.out &&\n-     diff --unified=0 M.out 18.out &&\n+     diff -u M.out 18.out &&\n      check_cache_at bozbar clean'\n \n test_expect_success \\\n@@ -225,9 +231,9 @@ test_expect_success \\\n      echo gnusto >bozbar &&\n      git-update-cache --add bozbar &&\n      echo gnusto gnusto >bozbar &&\n-     git-read-tree -m $treeH $treeM &&\n+     read_tree_twoway $treeH $treeM &&\n      git-ls-files --stage >19.out &&\n-     diff --unified=0 M.out 19.out &&\n+     diff -u M.out 19.out &&\n      check_cache_at bozbar dirty'\n \n test_expect_success \\\n@@ -235,9 +241,9 @@ test_expect_success \\\n     'rm -f .git/index &&\n      echo bozbar >bozbar &&\n      git-update-cache --add bozbar &&\n-     git-read-tree -m $treeH $treeM &&\n+     read_tree_twoway $treeH $treeM &&\n      git-ls-files --stage >20.out &&\n-     diff --unified=0 M.out 20.out &&\n+     diff -u M.out 20.out &&\n      check_cache_at bozbar dirty'\n \n test_expect_success \\\n@@ -246,7 +252,7 @@ test_expect_success \\\n      echo bozbar >bozbar &&\n      git-update-cache --add bozbar &&\n      echo gnusto gnusto >bozbar &&\n-     if git-read-tree -m $treeH $treeM; then false; else :; fi'\n+     if read_tree_twoway $treeH $treeM; then false; else :; fi'\n \n # Also make sure we did not break DF vs DF/DF case.\n test_expect_success \\\n@@ -273,9 +279,10 @@ test_expect_success \\\n      rm -fr DF &&\n      echo DF >DF &&\n      git-update-cache --add DF &&\n-     git-read-tree -m $treeDF $treeDFDF &&\n+     read_tree_twoway $treeDF $treeDFDF &&\n      git-ls-files --stage >DFDFcheck.out &&\n-     diff --unified=0 DFDF.out DFDFcheck.out &&\n-     check_cache_at DF/DF dirty'\n+     diff -u DFDF.out DFDFcheck.out &&\n+     check_cache_at DF/DF dirty &&\n+     :'\n \n test_done\n------------\n\n"}]}