* Re: git-1.4.0 make problems @ 2006-06-17 10:16 Michael Somos 2006-06-17 13:09 ` Dennis Stosberg 2006-06-17 22:11 ` git-1.4.0 make problems Rene Scharfe 0 siblings, 2 replies; 5+ messages in thread From: Michael Somos @ 2006-06-17 10:16 UTC (permalink / raw) To: rene.scharfe; +Cc: git Rene Scharfe wrote : > | tar: pax_global_header: Unknown file type 'g', extracted as normal > You can ignore or delete that file. It is a pax extended global header, Yes, I knew I could ignore the file right away. I figured it was due to some new feature of GNU tar. > was released on 2001-08-29, by the way. May I ask what operating system > and version you are using? Mandrake 8,1 for i586. I had not encountered problems with GNU tar 1.13.22 before. A quick google showed this was not a rare problem, but nothing in the tarball for git-1.4.0 mentioned this problem. I understand that it may be a rare or nonexistant problem for the target audience of "git", but just a sentence or two would be enough clue to help out those who may need it. > It took me a while to realize that your diffs are reversed. It's too Yes, unfortunately, I did reverse it, but even patch can handle that. > A good first exercise would be to fetch the git repository, edit Makefile > and commit your change, and then send a patch to this list -- all using A good suggestion, but I am a newbie as you can tell, and would prefer to play in a sandbox for some time before I would attempt it. Of more concern to me now is a failed test : > * FAIL 12: apply diff between 3 and 2 > git-apply <diff.3-2 && diff frotz.2 frotz > * failed 2 among 12 test(s) > make[1]: *** [t4101-apply-nonl.sh] Error 1 All the other tests worked which is great. Thanks for your reply. Shalom, Michael ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git-1.4.0 make problems 2006-06-17 10:16 git-1.4.0 make problems Michael Somos @ 2006-06-17 13:09 ` Dennis Stosberg 2006-06-17 14:46 ` Michael Somos 2006-06-17 22:11 ` git-1.4.0 make problems Rene Scharfe 1 sibling, 1 reply; 5+ messages in thread From: Dennis Stosberg @ 2006-06-17 13:09 UTC (permalink / raw) To: Michael Somos; +Cc: rene.scharfe, git Michael Somos wrote: > A good suggestion, but I am a newbie as you can tell, and would prefer to > play in a sandbox for some time before I would attempt it. Of more concern > to me now is a failed test : > > > * FAIL 12: apply diff between 3 and 2 > > git-apply <diff.3-2 && diff frotz.2 frotz > > * failed 2 among 12 test(s) > > make[1]: *** [t4101-apply-nonl.sh] Error 1 I have seen this test failing on FreeBSD 5.3, too. FreeBSD comes with a version of "diff" which does not add the "\ No newline at end of file" remark. Maybe your "diff" is simply too old. In that case, it's not a serious problem because Git uses its own internal diff implementation. The intention of this test is to test git-apply and not the system's "diff", so perhaps it should bring along all its patches and not rely on the system's "diff" to generate them... Regards, Dennis ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git-1.4.0 make problems @ 2006-06-17 14:46 ` Michael Somos 2006-06-17 15:02 ` [PATCH] Make t4101-apply-nonl bring along its patches Dennis Stosberg 0 siblings, 1 reply; 5+ messages in thread From: Michael Somos @ 2006-06-17 14:46 UTC (permalink / raw) To: dennis; +Cc: git, rene.scharfe Dennis Stosberg wrote : > I have seen this test failing on FreeBSD 5.3, too. FreeBSD comes with a > version of "diff" which does not add the "\ No newline at end of file" > remark. Maybe your "diff" is simply too old. In that case, it's not a > serious problem because Git uses its own internal diff implementation. You are exactly right. My "diff" is a bit too old. It was 2.7 and the latest stable is 2.8.1 which fixes the newline problem. > The intention of this test is to test git-apply and not the system's > "diff", so perhaps it should bring along all its patches and not rely > on the system's "diff" to generate them... That seems like a good suggestion if it is as you wrote. Thanks for the information regarding diff and git. Shalom, Michael ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Make t4101-apply-nonl bring along its patches 2006-06-17 14:46 ` Michael Somos @ 2006-06-17 15:02 ` Dennis Stosberg 0 siblings, 0 replies; 5+ messages in thread From: Dennis Stosberg @ 2006-06-17 15:02 UTC (permalink / raw) To: Michael Somos; +Cc: git, rene.scharfe Some versions of "diff" (e.g. on FreeBSD and older Linux systems) do not support the "\ No newline at end of file" remark and are not able to generate the patches needed for this test. This lets the test fail, although git-apply is working perfectly. This patch adds the pre-generated patches to t/t4100/ and makes the test use them. Signed-off-by: Dennis Stosberg <dennis@stosberg.net> --- t/t4101-apply-nonl.sh | 6 +----- t/t4101/diff.0-1 | 6 ++++++ t/t4101/diff.0-2 | 7 +++++++ t/t4101/diff.0-3 | 8 ++++++++ t/t4101/diff.1-0 | 6 ++++++ t/t4101/diff.1-2 | 8 ++++++++ t/t4101/diff.1-3 | 8 ++++++++ t/t4101/diff.2-0 | 7 +++++++ t/t4101/diff.2-1 | 8 ++++++++ t/t4101/diff.2-3 | 7 +++++++ t/t4101/diff.3-0 | 8 ++++++++ t/t4101/diff.3-1 | 8 ++++++++ t/t4101/diff.3-2 | 7 +++++++ 13 files changed, 89 insertions(+), 5 deletions(-) diff --git a/t/t4101-apply-nonl.sh b/t/t4101-apply-nonl.sh index 26b131d..026fac8 100755 --- a/t/t4101-apply-nonl.sh +++ b/t/t4101-apply-nonl.sh @@ -20,14 +20,10 @@ do for j in 0 1 2 3 do test $i -eq $j && continue - diff -u frotz.$i frotz.$j | - sed -e ' - /^---/s|.*|--- a/frotz| - /^+++/s|.*|+++ b/frotz|' >diff.$i-$j cat frotz.$i >frotz test_expect_success \ "apply diff between $i and $j" \ - "git-apply <diff.$i-$j && diff frotz.$j frotz" + "git-apply <../t4101/diff.$i-$j && diff frotz.$j frotz" done done diff --git a/t/t4101/diff.0-1 b/t/t4101/diff.0-1 new file mode 100644 index 0000000..1010a88 --- /dev/null +++ b/t/t4101/diff.0-1 @@ -0,0 +1,6 @@ +--- a/frotz ++++ b/frotz +@@ -1,2 +1,3 @@ + a + b ++c diff --git a/t/t4101/diff.0-2 b/t/t4101/diff.0-2 new file mode 100644 index 0000000..36460a2 --- /dev/null +++ b/t/t4101/diff.0-2 @@ -0,0 +1,7 @@ +--- a/frotz ++++ b/frotz +@@ -1,2 +1,2 @@ + a +-b ++b +\ No newline at end of file diff --git a/t/t4101/diff.0-3 b/t/t4101/diff.0-3 new file mode 100644 index 0000000..b281c43 --- /dev/null +++ b/t/t4101/diff.0-3 @@ -0,0 +1,8 @@ +--- a/frotz ++++ b/frotz +@@ -1,2 +1,3 @@ + a +-b ++c ++b +\ No newline at end of file diff --git a/t/t4101/diff.1-0 b/t/t4101/diff.1-0 new file mode 100644 index 0000000..f0a2e92 --- /dev/null +++ b/t/t4101/diff.1-0 @@ -0,0 +1,6 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,2 @@ + a + b +-c diff --git a/t/t4101/diff.1-2 b/t/t4101/diff.1-2 new file mode 100644 index 0000000..2a440a5 --- /dev/null +++ b/t/t4101/diff.1-2 @@ -0,0 +1,8 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,2 @@ + a +-b +-c ++b +\ No newline at end of file diff --git a/t/t4101/diff.1-3 b/t/t4101/diff.1-3 new file mode 100644 index 0000000..61aff97 --- /dev/null +++ b/t/t4101/diff.1-3 @@ -0,0 +1,8 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,3 @@ + a +-b + c ++b +\ No newline at end of file diff --git a/t/t4101/diff.2-0 b/t/t4101/diff.2-0 new file mode 100644 index 0000000..c2e71ee --- /dev/null +++ b/t/t4101/diff.2-0 @@ -0,0 +1,7 @@ +--- a/frotz ++++ b/frotz +@@ -1,2 +1,2 @@ + a +-b +\ No newline at end of file ++b diff --git a/t/t4101/diff.2-1 b/t/t4101/diff.2-1 new file mode 100644 index 0000000..a66d9fd --- /dev/null +++ b/t/t4101/diff.2-1 @@ -0,0 +1,8 @@ +--- a/frotz ++++ b/frotz +@@ -1,2 +1,3 @@ + a +-b +\ No newline at end of file ++b ++c diff --git a/t/t4101/diff.2-3 b/t/t4101/diff.2-3 new file mode 100644 index 0000000..5633c83 --- /dev/null +++ b/t/t4101/diff.2-3 @@ -0,0 +1,7 @@ +--- a/frotz ++++ b/frotz +@@ -1,2 +1,3 @@ + a ++c + b +\ No newline at end of file diff --git a/t/t4101/diff.3-0 b/t/t4101/diff.3-0 new file mode 100644 index 0000000..10b1a41 --- /dev/null +++ b/t/t4101/diff.3-0 @@ -0,0 +1,8 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,2 @@ + a +-c +-b +\ No newline at end of file ++b diff --git a/t/t4101/diff.3-1 b/t/t4101/diff.3-1 new file mode 100644 index 0000000..c799c60 --- /dev/null +++ b/t/t4101/diff.3-1 @@ -0,0 +1,8 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,3 @@ + a ++b + c +-b +\ No newline at end of file diff --git a/t/t4101/diff.3-2 b/t/t4101/diff.3-2 new file mode 100644 index 0000000..f8d1ba6 --- /dev/null +++ b/t/t4101/diff.3-2 @@ -0,0 +1,7 @@ +--- a/frotz ++++ b/frotz +@@ -1,3 +1,2 @@ + a +-c + b +\ No newline at end of file -- 1.4.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: git-1.4.0 make problems 2006-06-17 10:16 git-1.4.0 make problems Michael Somos 2006-06-17 13:09 ` Dennis Stosberg @ 2006-06-17 22:11 ` Rene Scharfe 1 sibling, 0 replies; 5+ messages in thread From: Rene Scharfe @ 2006-06-17 22:11 UTC (permalink / raw) To: Michael Somos; +Cc: Git Mailing List Michael Somos wrote: > A good suggestion, but I am a newbie as you can tell, and would prefer to > play in a sandbox for some time before I would attempt it. You already sent a diff in your first message, so you're not that much of a newbie. :-) Thanks for telling us about your first encounter with git, by the way. Take your time, and have fun learning and using git! René ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2006-06-17 22:11 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2006-06-17 10:16 git-1.4.0 make problems Michael Somos 2006-06-17 13:09 ` Dennis Stosberg 2006-06-17 14:46 ` Michael Somos 2006-06-17 15:02 ` [PATCH] Make t4101-apply-nonl bring along its patches Dennis Stosberg 2006-06-17 22:11 ` git-1.4.0 make problems Rene Scharfe
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).