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

Re: [ANNOUNCE] Git v2.22.0-rc1

From
Bryan Turner <bturner@atlassian.com>
Date
May 20, 2019, 19:06 UTC
Message-ID
<CAGyf7-F-d-n39fJmjYc_2rjqQa4d7PFCx63LwW3m7PFetEgzEw@mail.gmail.com>
In-Reply-To
<xmqq36la24t1.fsf@gitster-ct.c.googlers.com>
On Sun, May 19, 2019 at 10:00 AM Junio C Hamano <gitster@pobox.com> wrote:
Show 5 quoted lines
>
>  * The diff machinery, one of the oldest parts of the system, which
>    long predates the parse-options API, uses fairly long and complex
>    handcrafted option parser.  This is being rewritten to use the
>    parse-options API.

It looks like with these changes it's no longer possible to use "-U" (or, I'd assume, "--unified") without adding an explicit number for context lines.

Was it not intended that a user could pass "-U" to explicitly say "I want a unified diff with the default number of context lines"? Because it's always worked that way, as far as I can tell (certainly since early 1.7.x releases). Is it possible, with the new parse-options code, to restore that behavior? Removing that is likely to be a pretty big disruption for Bitbucket Server, which has always explicitly passed "-U" to "git diff". If the community wants to move forward with the change, I understand. I'm not trying to roadblock it; I'm just listing an explicit example of something that will be significantly affected by the change. Perhaps Git 2.22 could emit a warning about the change in behavior and then a subsequent version could turn it into an error, to give us (and anyone else relying on this behavior) more time to make adjustments?

I'm aware a unified diff is the default output, but many commands have flags that essentially tell Git to do what it would do by default. That can help counter changes in the default, as well as safeguarding against new config options that allow specifying a different default (as it were). For example, "git diff" has "--no-color", which could override configuration and essentially applied the default behavior--until the default configuration was changed in 1.8.4 from "never" to "auto". By using "--no-color", even though we didn't "need" to, we were protected against that change in the default.

Best regards, Bryan Turner

Previous: Johannes SchindelinNext: Ævar Arnfjörð Bjarmason
Message 3 of 12 in “[ANNOUNCE] Git v2.22.0-rc1”
  1. Junio C HamanoMay 19, 2019
  2. Johannes SchindelinMay 19, 2019
  3. Bryan TurnerMay 20, 2019
  4. Ævar Arnfjörð BjarmasonMay 20, 2019
  5. Duy NguyenMay 21, 2019
  6. Duy NguyenMay 21, 2019
  7. Ævar Arnfjörð BjarmasonMay 21, 2019
  8. Duy NguyenMay 21, 2019
  9. New diff test failures on s390x architecture (was: [ANNOUNCE] Git v2.22.0-rc1)Todd Zullinger, May 23, 2019
  10. Todd ZullingerMay 23, 2019
  11. Duy NguyenMay 23, 2019
  12. Todd ZullingerMay 23, 2019

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.