Junio C Hamano wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >>> * /usr/bin/patch - really old version, doesn't do well with some >>> diff formats. I avoid using it. >> t4109 seems to use patch to produce expected output for the tests; we >> should ship a precomputed expected results. Do you know of any other >> places "patch" is used? > > As usual, I won't commit this patch unless I hear from people who > potentially would benefit from it. I do not need such a patch myself and > I really shouldn't be spending too much of my time on these. Unless I'm doing something wrong, this doesn't apply cleanly to master. > -- >8 -- > [PATCH] do not rely on external "patch" in tests > > Some of our tests assumed a working "patch" command to produce expected > results when checking "git-apply", but some systems have broken "patch". > > We can compare our output with expected output that is precomputed > instead to sidestep this issue. > > Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> > --- > t/t4109-apply-multifrag.sh | 119 +++++++++++++++++++++++++++++++++++--------- > t/t4110-apply-scan.sh | 35 ++++++++++--- > 2 files changed, 123 insertions(+), 31 deletions(-) > > diff --git a/t/t4109-apply-multifrag.sh b/t/t4109-apply-multifrag.sh > index bd40a21..4805863 100755 > --- a/t/t4109-apply-multifrag.sh > +++ b/t/t4109-apply-multifrag.sh > @@ -138,39 +138,112 @@ diff --git a/main.c b/main.c The t4109-apply-multifrag.sh that I have only has 52 lines. > EOF It does not have this line above. Perhaps you also moved the ../t4109/patch*.patch files into the script in another commit? -brandon -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
