git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/5] t4211: demonstrate empty -L range crash

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Jul 23, 2013, 23:15 UTC
Message-ID
<CAPig+cTPcFJ_kfQ7zveE-Uf-itRRw2O99vQ61Or0QHvkKnxc_g@mail.gmail.com>
In-Reply-To
<7vvc416qvq.fsf@alter.siamese.dyndns.org>
On Tue, Jul 23, 2013 at 3:03 PM, Junio C Hamano <gitster@pobox.com> wrote:
> SZEDER Gábor <szeder@ira.uka.de> writes:
>> You could avoid the 'cat' here and patch in 4/5 by doing $(wc -l <b.c).
> Correct.
Thanks, I like that better.

Unfortunately, what actually got queued on 'next', after applying this fix-up and re-ordering the patch series, is slightly bogus. The diff for f8395edc (range-set: satisfy non-empty ranges invariant) looks like this:

@@ -67,7 +67,8 @@ test_bad_opts "-L :foo:b.c" "no match"
 # There is a separate bug when an empty -L range is the first -L encountered,
 # thus to demonstrate this particular bug, the empty -L range must follow a
 # non-empty -L range.
-test_expect_failure '-L {empty-range} (any -L)' '
+test_expect_success '-L {empty-range} (any -L)' '
+ n=$(expr $(cat b.c | wc -l) + 1) &&
  n=$(expr $(wc -l <b.c) + 1) &&
  git log -L1,1:b.c -L$n:b.c
 '

which incorrectly adds back the $(cat b.c | wc -l) line just above the
fixed $(wc -l <b.c) line.
Previous: SZEDER GáborNext: Junio C Hamano
Message 7 of 17 in “range-set and line-log bug fixes”
  1. 0/5 range-set and line-log bug fixesEric Sunshine, Jul 23, 2013
  2. 1/5 range-set: fix sort_and_merge_range_set() corner case bugEric Sunshine, Jul 23, 2013
  3. 2/5 t4211: demonstrate empty -L range crashEric Sunshine, Jul 23, 2013
  4. SZEDER GáborJul 23, 2013
  5. Junio C HamanoJul 23, 2013
  6. SZEDER GáborJul 23, 2013
  7. Eric SunshineJul 23, 2013
  8. Junio C HamanoJul 24, 2013
  9. Eric SunshineJul 24, 2013
  10. 3/5 range-set: satisfy non-empty ranges invariantEric Sunshine, Jul 23, 2013
  11. 4/5 t4211: demonstrate crash when first -L encountered is empty rangeEric Sunshine, Jul 23, 2013
  12. 5/5 line-log: fix "log -LN" crash when N is last line of fileEric Sunshine, Jul 23, 2013
  13. Thomas RastJul 23, 2013
  14. Eric SunshineJul 25, 2013
  15. Eric SunshineJul 25, 2013
  16. Johannes SixtJul 25, 2013
  17. Eric SunshineJul 25, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.