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

Re: [PATCH v2] diff: don't read index when --no-index is given

From
Thomas Gummerer <t.gummerer@gmail.com>
Date
Dec 9, 2013, 21:17 UTC
Message-ID
<87mwk9n2r4.fsf@gmail.com>
In-Reply-To
<CAPig+cT_TXEAV-Jb_1N8vhKyenpEJLpw+7J45bsQ6aycdO3ftg@mail.gmail.com>
Eric Sunshine <sunshine@sunshineco.com> writes:
Show 44 quoted lines
> On Mon, Dec 9, 2013 at 3:40 PM, Thomas Gummerer <t.gummerer@gmail.com> wrote:
>> git diff --no-index ... currently reads the index, during setup, when
>> calling gitmodules_config().  This results in worse performance when
>> the index is not actually needed.  This patch avoids calling
>> gitmodules_config() when the --no-index option is given.  The times for
>> executing "git diff --no-index" in the WebKit repository are improved as
>> follows:
>>
>> Test                      HEAD~3            HEAD
>> ------------------------------------------------------------------
>> 4001.1: diff --no-index   0.24(0.15+0.09)   0.01(0.00+0.00) -95.8%
>>
>> An additional improvement of this patch is that "git diff --no-index" no
>> longer breaks when the index file is corrupt, which makes it possible to
>> use it for investigating the broken repository.
>>
>> To improve the possible usage as investigation tool for broken
>> repositories, setup_git_directory_gently() is also not called when the
>> --no-index option is given.
>>
>> Also add a test to guard against future breakages, and a performance
>> test to show the improvements.
>>
>> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
>> ---
>> diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh
>> index 979e983..d3dbf6b 100755
>> --- a/t/t4053-diff-no-index.sh
>> +++ b/t/t4053-diff-no-index.sh
>> @@ -29,4 +29,10 @@ test_expect_success 'git diff --no-index relative path outside repo' '
>>         )
>>  '
>>
>> +test_expect_success 'git diff --no-index with broken index' '
>> +       cd repo &&
>> +       echo broken >.git/index &&
>> +       git diff --no-index a ../non/git/a &&
>> +'
>
> Stray && on the last line of the test.
>
> Also, don't you want to do the 'cd' and subsequent commands inside a
> subshell so that tests added after this one won't have to worry about
> cd'ing back to the top-level?

Thanks both to you and Torsten for catching both issues, I'll fix them in a re-roll.

>> +
>>  test_done
>> --
>> 1.8.5.4.g8639e57

-- Thomas

Previous: Eric SunshineNext: Junio C Hamano
Message 10 of 30 in “diff: don't read index when --no-index is given”
  1. diff: don't read index when --no-index is givenThomas Gummerer, Dec 9, 2013
  2. Jonathan NiederDec 9, 2013
  3. Jens LehmannDec 9, 2013
  4. Jonathan NiederDec 9, 2013
  5. Thomas GummererDec 9, 2013
  6. Jonathan NiederDec 9, 2013
  7. diff: don't read index when --no-index is givenThomas Gummerer, Dec 9, 2013
  8. Torsten BögershausenDec 9, 2013
  9. Eric SunshineDec 9, 2013
  10. Thomas GummererDec 9, 2013
  11. Junio C HamanoDec 9, 2013
  12. Thomas GummererDec 9, 2013
  13. 1/2 diff: move no-index detection to builtin/diff.cThomas Gummerer, Dec 10, 2013
  14. 2/2 diff: don't read index when --no-index is givenThomas Gummerer, Dec 10, 2013
  15. Jonathan NiederDec 10, 2013
  16. Thomas GummererDec 10, 2013
  17. Jonathan NiederDec 10, 2013
  18. Thomas GummererDec 10, 2013
  19. 1/2 diff: move no-index detection to builtin/diff.cThomas Gummerer, Dec 11, 2013
  20. 2/2 diff: don't read index when --no-index is givenThomas Gummerer, Dec 11, 2013
  21. Junio C HamanoDec 12, 2013
  22. Jonathan NiederDec 14, 2013
  23. Jonathan NiederDec 14, 2013
  24. Thomas GummererDec 14, 2013
  25. Junio C HamanoDec 16, 2013
  26. 1/2 diff: add test for --no-index executed outside repoThomas Gummerer, Dec 16, 2013
  27. 2/2 diff: avoid some nestingThomas Gummerer, Dec 16, 2013
  28. Junio C HamanoDec 16, 2013
  29. 1/2 diff: move no-index detection to builtin/diff.cThomas Gummerer, Dec 14, 2013
  30. 2/2 diff: don't read index when --no-index is givenThomas Gummerer, Dec 14, 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.