{"thread":{"id":"19299","subject":"(unknown)","startedAt":"2009-05-11T18:57:12Z","lastAt":"2009-05-11T18:57:12Z","messageCount":1,"participants":["Don Slutz"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"113567","messageId":"200905111857.n4BIvC6l002323@krl.krl.com","threadId":"19299","inReplyTo":null,"subject":"(unknown)","fromName":"Don Slutz","fromEmail":"slutz@krl.com","sentAt":"2009-05-11T18:57:12Z","receivedAt":"2009-05-11T18:57:12Z","isPatch":false,"sender":{"key":"slutz@krl.com","avatar":null},"body":">From c03250cd23864b53986708070cf6d03f4334475d Mon Sep 17 00:00:00 2001\nFrom: Don Slutz <Don.Slutz@SierraAtlantic.com>\nDate: Mon, 11 May 2009 12:19:37 -0400\nSubject: [PATCH 5/6] Fix tests to work with core.autocrlf=true\n\nSwitch from using cmp to using test_cmp in these tests.\n\nSigned-off-by: Don Slutz <Don.Slutz@SierraAtlantic.com>\n---\n t/t0021-conversion.sh        |   12 ++++++------\n t/t1020-subdirectory.sh      |   12 ++++++------\n t/t4127-apply-same-fn.sh     |    2 +-\n t/t6021-merge-criss-cross.sh |    2 +-\n t/t6026-merge-attr.sh        |   10 +++++-----\n 5 files changed, 19 insertions(+), 19 deletions(-)\n\ndiff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh\nindex 8fc39d7..7a6d8c7 100755\n--- a/t/t0021-conversion.sh\n+++ b/t/t0021-conversion.sh\n@@ -33,17 +33,17 @@ test_expect_success setup '\n \tgit checkout -- test test.t test.i\n '\n \n-script='s/^\\$Id: \\([0-9a-f]*\\) \\$/\\1/p'\n-\n test_expect_success check '\n \n-\tcmp test.o test &&\n-\tcmp test.o test.t &&\n+\ttest_cmp test.o test &&\n+\ttest_cmp test.o test.t &&\n \n \t# ident should be stripped in the repository\n \tgit diff --raw --exit-code :test :test.i &&\n \tid=$(git rev-parse --verify :test) &&\n-\tembedded=$(sed -ne \"$script\" test.i) &&\n+\ttest_debug \"echo id=$id\"\n+\tembedded=$(grep Id: test.i | cut -d\\  -f2) &&\n+\ttest_debug \"echo embedded=$embedded\"\n \ttest \"z$id\" = \"z$embedded\" &&\n \n \tgit cat-file blob :test.t > test.r &&\n@@ -85,7 +85,7 @@ test_expect_success expanded_in_repo '\n \trm -f expanded-keywords &&\n \tgit checkout -- expanded-keywords &&\n \tcat expanded-keywords &&\n-\tcmp expanded-keywords expected-output\n+\ttest_cmp expanded-keywords expected-output\n '\n \n test_done\ndiff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh\nindex 210e594..ce67e6c 100755\n--- a/t/t1020-subdirectory.sh\n+++ b/t/t1020-subdirectory.sh\n@@ -86,10 +86,10 @@ test_expect_success 'write-tree' '\n test_expect_success 'checkout-index' '\n \tcd \"$HERE\" &&\n \tgit checkout-index -f -u one &&\n-\tcmp one original.one &&\n+\ttest_cmp one original.one &&\n \tcd dir &&\n \tgit checkout-index -f -u two &&\n-\tcmp two ../original.two\n+\ttest_cmp two ../original.two\n '\n \n test_expect_success 'read-tree' '\n@@ -97,13 +97,13 @@ test_expect_success 'read-tree' '\n \trm -f one dir/two &&\n \ttree=`git write-tree` &&\n \tgit read-tree --reset -u \"$tree\" &&\n-\tcmp one original.one &&\n-\tcmp dir/two original.two &&\n+\ttest_cmp one original.one &&\n+\ttest_cmp dir/two original.two &&\n \tcd dir &&\n \trm -f two &&\n \tgit read-tree --reset -u \"$tree\" &&\n-\tcmp two ../original.two &&\n-\tcmp ../one ../original.one\n+\ttest_cmp two ../original.two &&\n+\ttest_cmp ../one ../original.one\n '\n \n test_expect_success 'no file/rev ambiguity check inside .git' '\ndiff --git a/t/t4127-apply-same-fn.sh b/t/t4127-apply-same-fn.sh\nindex 3a8202e..66b774f 100755\n--- a/t/t4127-apply-same-fn.sh\n+++ b/t/t4127-apply-same-fn.sh\n@@ -27,7 +27,7 @@ test_expect_success 'apply same filename with independent changes' '\n \tcp same_fn same_fn2 &&\n \tgit reset --hard &&\n \tgit apply patch0 &&\n-\tdiff same_fn same_fn2\n+\ttest_cmp same_fn same_fn2\n '\n \n test_expect_success 'apply same filename with overlapping changes' '\ndiff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh\nindex 331b9b0..53fdfd8 100755\n--- a/t/t6021-merge-criss-cross.sh\n+++ b/t/t6021-merge-criss-cross.sh\n@@ -87,7 +87,7 @@ cat > file-expect <<EOF\n 9\n EOF\n \n-test_expect_success 'Criss-cross merge result' 'cmp file file-expect'\n+test_expect_success 'Criss-cross merge result' 'test_cmp file file-expect'\n \n test_expect_success 'Criss-cross merge fails (-s resolve)' \\\n 'git reset --hard A^ &&\ndiff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh\nindex 1ba0a25..0b57c68 100755\n--- a/t/t6026-merge-attr.sh\n+++ b/t/t6026-merge-attr.sh\n@@ -63,7 +63,7 @@ test_expect_success 'check merge result in working tree' '\n \n \tgit cat-file -p HEAD:binary >binary-orig &&\n \tgrep \"<<<<<<<\" text &&\n-\tcmp binary-orig binary &&\n+\ttest_cmp binary-orig binary &&\n \t! grep \"<<<<<<<\" union &&\n \tgrep Master union &&\n \tgrep Side union\n@@ -104,14 +104,14 @@ test_expect_success 'custom merge backend' '\n \n \tgit merge master &&\n \n-\tcmp binary union &&\n+\ttest_cmp binary union &&\n \tsed -e 1,3d text >check-1 &&\n \to=$(git unpack-file master^:text) &&\n \ta=$(git unpack-file side^:text) &&\n \tb=$(git unpack-file master:text) &&\n \tsh -c \"./custom-merge $o $a $b 0\" &&\n \tsed -e 1,3d $a >check-2 &&\n-\tcmp check-1 check-2 &&\n+\ttest_cmp check-1 check-2 &&\n \trm -f $o $a $b\n '\n \n@@ -131,14 +131,14 @@ test_expect_success 'custom merge backend' '\n \t\techo \"Ok, conflicted\"\n \tfi &&\n \n-\tcmp binary union &&\n+\ttest_cmp binary union &&\n \tsed -e 1,3d text >check-1 &&\n \to=$(git unpack-file master^:text) &&\n \ta=$(git unpack-file anchor:text) &&\n \tb=$(git unpack-file master:text) &&\n \tsh -c \"./custom-merge $o $a $b 0\" &&\n \tsed -e 1,3d $a >check-2 &&\n-\tcmp check-1 check-2 &&\n+\ttest_cmp check-1 check-2 &&\n \trm -f $o $a $b\n '\n \n-- \n1.6.3.15.g49878\n"}]}