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

Re: [PATCH 4/5] diff: introduce diff.submoduleFormat configuration variable

From
Jens Lehmann <jens.lehmann@web.de>
Date
Oct 30, 2012, 21:26 UTC
Message-ID
<509045EF.9030401@web.de>
In-Reply-To
<CALkWK0nPJ-8UvyYN800-Tj+mLQtv-vF3SJScb1O8EEiY238Z6w@mail.gmail.com>
Am 29.10.2012 11:30, schrieb Ramkumar Ramachandra:
Show 21 quoted lines
> Jens Lehmann wrote:
>> Am 02.10.2012 21:44, schrieb Jens Lehmann:
>>> Am 02.10.2012 18:51, schrieb Ramkumar Ramachandra:
>>>> Introduce a diff.submoduleFormat configuration variable corresponding
>>>> to the '--submodule' command-line option of 'git diff'.
>>>
>>> Nice. Maybe a better name would be "diff.submodule", as this sets the
>>> default for the "--submodule" option of diff?
>>>
>>> And I think you should also test in t4041 that "--submodule=short"
>>> overrides the config setting.
>>
>> We also need tests which show that setting that config to "log" does
>> not break one of the many users of "git diff" ("stash", "rebase" and
>> "format-patch" come to mind, most probably I missed some others). I
>> suspect we'll have to add "--submodule=short" options to some call
>> sites to keep them working with submodule changes.
> 
> Um, why would "stash", "rebase" or "format-patch" be affected by this
> setting?  They don't operate on submodules at all.  To be sure, I ran
> all the tests with the following diff and nothing broke.

They do operate on the submodule commits too (while they don't touch submodule work trees) and IIRC rebase applies diffs, so that could break when the output of diff changes due to the new config option. But it looks like your test did prove that nothing goes wrong there, I assume they they use plumbing diff commands which aren't affected by the new option.

Previous: Ramkumar RamachandraNext: Ramkumar Ramachandra
Message 13 of 14 in “submodule: introduce diff.submoduleFormat”
  1. 0/5 submodule: introduce diff.submoduleFormatRamkumar Ramachandra, Oct 2, 2012
  2. 1/5 Documentation: move diff.wordRegex from config.txt to diff-config.txtRamkumar Ramachandra, Oct 2, 2012
  3. 2/5 Documentation: sort diff-config.txt alphabeticallyRamkumar Ramachandra, Oct 2, 2012
  4. 3/5 diff: acknowledge --submodule=short command-line optionRamkumar Ramachandra, Oct 2, 2012
  5. Jens LehmannOct 2, 2012
  6. Ramkumar RamachandraOct 7, 2012
  7. Jens LehmannOct 7, 2012
  8. Jens LehmannOct 7, 2012
  9. 4/5 diff: introduce diff.submoduleFormat configuration variableRamkumar Ramachandra, Oct 2, 2012
  10. Jens LehmannOct 2, 2012
  11. Jens LehmannOct 3, 2012
  12. Ramkumar RamachandraOct 29, 2012
  13. Jens LehmannOct 30, 2012
  14. 5/5 submodule: display summary header in boldRamkumar Ramachandra, Oct 2, 2012

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.