Re: [PATCH] Re-re-re-fix common tail optimization
From: Charles Bailey <hidden>
Date: 2016-06-15 22:44:00
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] Re-re-re-fix common tail optimization · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Re-re-re-fix common tail optimization · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Re-re-re-fix common tail optimization · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] Re-re-re-fix common tail optimization · Jeff King <hidden>
- 2016-06-15 · Re: [PATCH] Re-re-re-fix common tail optimization · Wincent Colaiuta <hidden>
On Wed, Dec 19, 2007 at 09:27:15AM -0500, Jeff King wrote:
On Wed, Dec 19, 2007 at 02:18:45PM +0000, Charles Bailey wrote:quoted
Just to add to the woe on this one, this test breaks on MacOS X due to the pattern length limitations of the default sed on that platform. Interested in a patch?Somebody beat you to it. :) Can you confirm that the fix in [ref] works for you? -Peff
Ooh, the excitement, I've never had the opportunity to "git am" before. Yes, I can confirm. It works for me. For reference I had the following, which is fewer lines but not inherently better in any other way. Charles.
diff --git a/t/t4024-diff-optimize-common.sh b/t/t4024-diff-optimize-common.sh
index 20fe87b..ffb2c8f 100755
--- a/t/t4024-diff-optimize-common.sh
+++ b/t/t4024-diff-optimize-common.sh@@ -7,8 +7,9 @@ test_description='common tail optimization' z=zzzzzzzz ;# 8 z="$z$z$z$z$z$z$z$z" ;# 64 z="$z$z$z$z$z$z$z$z" ;# 512 -z="$z$z$z$z" ;# 2048 -z2047=$(expr "$z" : '.\(.*\)') ; #2047 +z="$z$z" ;# 1024 +z1023=$(expr "$z" : '.\(.*\)') ; #1023 +z2047=$z$z1023 test_expect_success setup '
@@ -35,8 +36,8 @@ diff --git a/file-a b/file-a --- a/file-a +++ b/file-a @@ -1 +1 @@ --aZ -+AZ +-aZZz ++AZZz diff --git a/file-b b/file-b --- a/file-b +++ b/file-b
@@ -47,9 +48,9 @@ diff --git a/file-c b/file-c --- a/file-c +++ b/file-c @@ -1 +1 @@ --cZ +-cZZz \ No newline at end of file -+CZ ++CZZz \ No newline at end of file diff --git a/file-d b/file-d --- a/file-d
@@ -61,7 +62,7 @@ EOF test_expect_success 'diff -U0' ' - git diff -U0 | sed -e "/^index/d" -e "s/$z2047/Z/g" >actual && + git diff -U0 | sed -e "/^index/d" -e "s/$z1023/Z/g" >actual && diff -u expect actual '
--
1.5.3.7.11.ga3d7