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

Re: [PATCH 1/2] diff: document behavior of relative diff.orderFile

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 10, 2017, 20:23 UTC
Message-ID
<xmqqziiyr7e9.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<xmqq4m16sm5v.fsf@gitster.mtv.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 16 quoted lines
> Richard Hansen <hansenr@google.com> writes:
>
>> On 2017-01-10 01:58, Jeff King wrote:
>> ...
>>> What happens in a bare repository?
>>>
>>> I'm guessing it's relative to the top-level of the repository,
>>
>> I just tried it out and it's relative to $PWD.
>
> That is understandable.  When the user says
>
>     $ cmd -O $file
>
> with any option -O that takes a filename, it is most natural if we
> used $PWD/$file when $file is not absolute path.

Ahh, ignore me in the above. The discussion is about the configuration variable, and I agree that being relative to GIT_DIR would have made more sense. In fact taking it as relative to PWD does not make any sense.

We should have been a lot more careful when we added 6d8940b562 ("diff: add diff.orderfile configuration variable", 2013-12-18), but it is too late to complain now.

A related tangent.

I wonder if anything that uses git_config_pathname() should be relative to GIT_DIR when it is not absolute.

Previous: Junio C HamanoNext: Richard Hansen
Message 6 of 24 in “minor diff orderfile documentation improvements”
  1. 0/2 minor diff orderfile documentation improvementsRichard Hansen, Jan 10, 2017
  2. 1/2 diff: document behavior of relative diff.orderFileRichard Hansen, Jan 10, 2017
  3. Jeff KingJan 10, 2017
  4. Richard HansenJan 10, 2017
  5. Junio C HamanoJan 10, 2017
  6. Junio C HamanoJan 10, 2017
  7. Richard HansenJan 10, 2017
  8. Junio C HamanoJan 10, 2017
  9. Jeff KingJan 11, 2017
  10. Junio C HamanoJan 11, 2017
  11. 2/2 diff: document the pattern format for diff.orderFileRichard Hansen, Jan 10, 2017
  12. Junio C HamanoJan 10, 2017
  13. Richard HansenJan 11, 2017
  14. Junio C HamanoJan 11, 2017
  15. Richard HansenJan 11, 2017
  16. Junio C HamanoJan 11, 2017
  17. Richard HansenJan 11, 2017
  18. Junio C HamanoJan 11, 2017
  19. 0/2 diff orderfile documentation improvementsRichard Hansen, Jan 11, 2017
  20. 1/2 diff: document behavior of relative diff.orderFileRichard Hansen, Jan 11, 2017
  21. 2/2 diff: document the format of the -O (diff.orderFile) fileRichard Hansen, Jan 11, 2017
  22. 0/2 diff orderfile documentation improvementsRichard Hansen, Jan 15, 2017
  23. 1/2 diff: document behavior of relative diff.orderFileRichard Hansen, Jan 15, 2017
  24. 2/2 diff: document the format of the -O (diff.orderFile) fileRichard Hansen, Jan 15, 2017

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.