{"thread":{"id":"4544","subject":"Re: git-1.4.0 make problems","startedAt":"2006-06-17T14:46:35Z","lastAt":"2006-06-17T15:02:45Z","messageCount":2,"participants":["Michael Somos","Dennis Stosberg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"21956","messageId":"200606171446.k5HEkZAx006686@grail.cba.csuohio.edu","threadId":"4544","inReplyTo":null,"subject":"Re: git-1.4.0 make problems","fromName":"Michael Somos","fromEmail":"somos@grail.cba.csuohio.edu","sentAt":"2006-06-17T14:46:35Z","receivedAt":"2006-06-17T14:46:35Z","isPatch":false,"sender":{"key":"somos@grail.cba.csuohio.edu","avatar":null},"body":"Dennis  Stosberg wrote :\n\n> I have seen this test failing on FreeBSD 5.3, too.  FreeBSD comes with a\n> version of \"diff\" which does not add the \"\\ No newline at end of file\"\n> remark.  Maybe your \"diff\" is simply too old.  In that case, it's not a\n> serious problem because Git uses its own internal diff implementation.\n\nYou are exactly right. My \"diff\" is a bit too old. It was 2.7 and the\nlatest stable is 2.8.1 which fixes the newline problem.\n\n> The intention of this test is to test git-apply and not the system's\n> \"diff\", so perhaps it should bring along all its patches and not rely\n> on the system's \"diff\" to generate them...\n\nThat seems like a good suggestion if it is as you wrote. Thanks for the\ninformation regarding diff and git. Shalom, Michael\n"},{"id":"21957","messageId":"20060617150245.G2842888b@leonov.stosberg.net","threadId":"4544","inReplyTo":"200606171446.k5HEkZAx006686@grail.cba.csuohio.edu","subject":"[PATCH] Make t4101-apply-nonl bring along its patches","fromName":"Dennis Stosberg","fromEmail":"dennis@stosberg.net","sentAt":"2006-06-17T15:02:45Z","receivedAt":"2006-06-17T15:02:45Z","isPatch":true,"sender":{"key":"dennis@stosberg.net","avatar":null},"body":"Some versions of \"diff\" (e.g. on FreeBSD and older Linux systems) do\nnot support the \"\\ No newline at end of file\" remark and are not\nable to generate the patches needed for this test.  This lets the\ntest fail, although git-apply is working perfectly.  This patch adds\nthe pre-generated patches to t/t4100/ and makes the test use them.\n\nSigned-off-by: Dennis Stosberg <dennis@stosberg.net>\n---\n\n t/t4101-apply-nonl.sh |    6 +-----\n t/t4101/diff.0-1      |    6 ++++++\n t/t4101/diff.0-2      |    7 +++++++\n t/t4101/diff.0-3      |    8 ++++++++\n t/t4101/diff.1-0      |    6 ++++++\n t/t4101/diff.1-2      |    8 ++++++++\n t/t4101/diff.1-3      |    8 ++++++++\n t/t4101/diff.2-0      |    7 +++++++\n t/t4101/diff.2-1      |    8 ++++++++\n t/t4101/diff.2-3      |    7 +++++++\n t/t4101/diff.3-0      |    8 ++++++++\n t/t4101/diff.3-1      |    8 ++++++++\n t/t4101/diff.3-2      |    7 +++++++\n 13 files changed, 89 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t4101-apply-nonl.sh b/t/t4101-apply-nonl.sh\nindex 26b131d..026fac8 100755\n--- a/t/t4101-apply-nonl.sh\n+++ b/t/t4101-apply-nonl.sh\n@@ -20,14 +20,10 @@ do\n   for j in 0 1 2 3\n   do\n     test $i -eq $j && continue\n-    diff -u frotz.$i frotz.$j |\n-    sed -e '\n-\t/^---/s|.*|--- a/frotz|\n-\t/^+++/s|.*|+++ b/frotz|' >diff.$i-$j\n     cat frotz.$i >frotz\n     test_expect_success \\\n         \"apply diff between $i and $j\" \\\n-\t\"git-apply <diff.$i-$j && diff frotz.$j frotz\"\n+\t\"git-apply <../t4101/diff.$i-$j && diff frotz.$j frotz\"\n   done\n done\n \ndiff --git a/t/t4101/diff.0-1 b/t/t4101/diff.0-1\nnew file mode 100644\nindex 0000000..1010a88\n--- /dev/null\n+++ b/t/t4101/diff.0-1\n@@ -0,0 +1,6 @@\n+--- a/frotz\n++++ b/frotz\n+@@ -1,2 +1,3 @@\n+ a\n+ b\n++c\ndiff --git a/t/t4101/diff.0-2 b/t/t4101/diff.0-2\nnew file mode 100644\nindex 0000000..36460a2\n--- /dev/null\n+++ b/t/t4101/diff.0-2\n@@ -0,0 +1,7 @@\n+--- a/frotz\n++++ b/frotz\n+@@ -1,2 +1,2 @@\n+ a\n+-b\n++b\n+\\ No newline at end of file\ndiff --git a/t/t4101/diff.0-3 b/t/t4101/diff.0-3\nnew file mode 100644\nindex 0000000..b281c43\n--- /dev/null\n+++ b/t/t4101/diff.0-3\n@@ -0,0 +1,8 @@\n+--- a/frotz\n++++ b/frotz\n+@@ -1,2 +1,3 @@\n+ a\n+-b\n++c\n++b\n+\\ No newline at end of file\ndiff --git a/t/t4101/diff.1-0 b/t/t4101/diff.1-0\nnew file mode 100644\nindex 0000000..f0a2e92\n--- /dev/null\n+++ b/t/t4101/diff.1-0\n@@ -0,0 +1,6 @@\n+--- a/frotz\n++++ b/frotz\n+@@ -1,3 +1,2 @@\n+ a\n+ b\n+-c\ndiff --git a/t/t4101/diff.1-2 b/t/t4101/diff.1-2\nnew file mode 100644\nindex 0000000..2a440a5\n--- /dev/null\n+++ b/t/t4101/diff.1-2\n@@ -0,0 +1,8 @@\n+--- a/frotz\n++++ b/frotz\n+@@ -1,3 +1,2 @@\n+ a\n+-b\n+-c\n++b\n+\\ No newline at end of file\ndiff --git a/t/t4101/diff.1-3 b/t/t4101/diff.1-3\nnew file mode 100644\nindex 0000000..61aff97\n--- /dev/null\n+++ b/t/t4101/diff.1-3\n@@ -0,0 +1,8 @@\n+--- a/frotz\n++++ b/frotz\n+@@ -1,3 +1,3 @@\n+ a\n+-b\n+ c\n++b\n+\\ No newline at end of file\ndiff --git a/t/t4101/diff.2-0 b/t/t4101/diff.2-0\nnew file mode 100644\nindex 0000000..c2e71ee\n--- /dev/null\n+++ b/t/t4101/diff.2-0\n@@ -0,0 +1,7 @@\n+--- a/frotz\n++++ b/frotz\n+@@ -1,2 +1,2 @@\n+ a\n+-b\n+\\ No newline at end of file\n++b\ndiff --git a/t/t4101/diff.2-1 b/t/t4101/diff.2-1\nnew file mode 100644\nindex 0000000..a66d9fd\n--- /dev/null\n+++ b/t/t4101/diff.2-1\n@@ -0,0 +1,8 @@\n+--- a/frotz\n++++ b/frotz\n+@@ -1,2 +1,3 @@\n+ a\n+-b\n+\\ No newline at end of file\n++b\n++c\ndiff --git a/t/t4101/diff.2-3 b/t/t4101/diff.2-3\nnew file mode 100644\nindex 0000000..5633c83\n--- /dev/null\n+++ b/t/t4101/diff.2-3\n@@ -0,0 +1,7 @@\n+--- a/frotz\n++++ b/frotz\n+@@ -1,2 +1,3 @@\n+ a\n++c\n+ b\n+\\ No newline at end of file\ndiff --git a/t/t4101/diff.3-0 b/t/t4101/diff.3-0\nnew file mode 100644\nindex 0000000..10b1a41\n--- /dev/null\n+++ b/t/t4101/diff.3-0\n@@ -0,0 +1,8 @@\n+--- a/frotz\n++++ b/frotz\n+@@ -1,3 +1,2 @@\n+ a\n+-c\n+-b\n+\\ No newline at end of file\n++b\ndiff --git a/t/t4101/diff.3-1 b/t/t4101/diff.3-1\nnew file mode 100644\nindex 0000000..c799c60\n--- /dev/null\n+++ b/t/t4101/diff.3-1\n@@ -0,0 +1,8 @@\n+--- a/frotz\n++++ b/frotz\n+@@ -1,3 +1,3 @@\n+ a\n++b\n+ c\n+-b\n+\\ No newline at end of file\ndiff --git a/t/t4101/diff.3-2 b/t/t4101/diff.3-2\nnew file mode 100644\nindex 0000000..f8d1ba6\n--- /dev/null\n+++ b/t/t4101/diff.3-2\n@@ -0,0 +1,7 @@\n+--- a/frotz\n++++ b/frotz\n+@@ -1,3 +1,2 @@\n+ a\n+-c\n+ b\n+\\ No newline at end of file\n-- \n1.4.0\n"}]}