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

Re: [PATCH v2 3/4] cat-file --textconv/--filters: allow specifying the path separately

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Aug 31, 2016, 19:49 UTC
Message-ID
<alpine.DEB.2.20.1608312133150.129229@virtualbox>
In-Reply-To
<xmqqwpj6owgg.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Wed, 24 Aug 2016, Junio C Hamano wrote:
Show 25 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
> 
> > Mentioned elsewhere, but I think the above should be
> >
> > 	if (!path)
> >         	path = obj_context.path;
> >
> > 	if (obj_context.mode == S_IFINVALID)
> >         	obj_context.mode = 0100644;
> >
> > IOW, even when there is an explicit path supplied, we should fall
> > back to assumed "regular blob" mode, so that
> >
> > 	git cat-file --filters --path=README $(git rev-parse :README)
> >
> > would work as expected.
> 
> Actually, I am reading the conditional the other way, but the
> conclusion "defaulting from unknown mode to regular blob is
> necessary whether the user gave us a path or not" is the same.
> 
> The current code may fail if --path is not available and 40-hex that
> does not give us any context of look up is given because it won't be
> able to decide how to filter, so using "else if" would not have
> practical difference there, but conceptually it still is wrong.
Let's translate the logic
	if (!path)
		path = obj_context.path;
	else if (obj_context.mode == S_IFINVALID)
		obj_context.mode = 0100644;
into plain English.
Basically, we have two cases:
1) the user provided us with a --path option, in which case we only
   override the mode if get_sha1_with_context() could not determine the
   mode.
2) the user did *not* provide us with a --path, in which case we keep the
   mode exactly as determined by get_sha1_with_context().

Now, the change you propose would change 2) such that we would *still* override an undecided mode with 100644, even if the user did not bother to specify a --path option.

It is true that it is currently impossible to infer a path from a blob ID without being able to infer also a mode. So the question is whether it makes sense to allow cat-file to proceed on the assumption that it is a regular file if it does not know?

I would say: no, it does not make sense.

However, I do not want to hold this patch series up just by being stubborn.

Will change it, Dscho

Previous: Junio C HamanoNext: Junio C Hamano
Message 44 of 66 in “cat-file: optionally convert to worktree version”
  1. 0/4 cat-file: optionally convert to worktree versionJohannes Schindelin, Aug 18, 2016
  2. 3/4 cat-file --textconv/--filters: allow specifying the path separatelyJohannes Schindelin, Aug 18, 2016
  3. Junio C HamanoAug 18, 2016
  4. Johannes SchindelinAug 19, 2016
  5. Junio C HamanoAug 19, 2016
  6. Johannes SchindelinAug 24, 2016
  7. 2/4 cat-file: introduce the --filters optionJohannes Schindelin, Aug 18, 2016
  8. Junio C HamanoAug 18, 2016
  9. Johannes SchindelinAug 19, 2016
  10. Torsten BögershausenAug 18, 2016
  11. Johannes SchindelinAug 19, 2016
  12. Junio C HamanoAug 19, 2016
  13. Torsten BögershausenAug 19, 2016
  14. Johannes SchindelinAug 19, 2016
  15. Junio C HamanoAug 19, 2016
  16. Torsten BögershausenAug 22, 2016
  17. Johannes SchindelinAug 24, 2016
  18. 4/4 cat-file: support --textconv/--filters in batch modeJohannes Schindelin, Aug 18, 2016
  19. Junio C HamanoAug 18, 2016
  20. Johannes SchindelinAug 19, 2016
  21. Jeff KingAug 19, 2016
  22. Jeff KingAug 18, 2016
  23. Junio C HamanoAug 18, 2016
  24. Johannes SchindelinAug 19, 2016
  25. Johannes SchindelinAug 19, 2016
  26. Jeff KingAug 19, 2016
  27. Torsten BögershausenAug 18, 2016
  28. Johannes SchindelinAug 19, 2016
  29. Jeff KingAug 19, 2016
  30. Junio C HamanoAug 19, 2016
  31. 1/4 cat-file: fix a grammo in the man pageJohannes Schindelin, Aug 18, 2016
  32. Junio C HamanoAug 18, 2016
  33. 0/4 cat-file: optionally convert to worktree versionJohannes Schindelin, Aug 24, 2016
  34. 4/4 cat-file: support --textconv/--filters in batch modeJohannes Schindelin, Aug 24, 2016
  35. 2/4 cat-file: introduce the --filters optionJohannes Schindelin, Aug 24, 2016
  36. Junio C HamanoAug 24, 2016
  37. Junio C HamanoAug 24, 2016
  38. Johannes SchindelinAug 31, 2016
  39. Junio C HamanoAug 31, 2016
  40. 1/4 cat-file: fix a grammo in the man pageJohannes Schindelin, Aug 24, 2016
  41. 3/4 cat-file --textconv/--filters: allow specifying the path separatelyJohannes Schindelin, Aug 24, 2016
  42. Junio C HamanoAug 24, 2016
  43. Junio C HamanoAug 24, 2016
  44. Johannes SchindelinAug 31, 2016
  45. Junio C HamanoAug 31, 2016
  46. Junio C HamanoAug 24, 2016
  47. Jeff KingAug 24, 2016
  48. Junio C HamanoAug 24, 2016
  49. Jeff KingAug 24, 2016
  50. Junio C HamanoAug 24, 2016
  51. Junio C HamanoAug 29, 2016
  52. Johannes SchindelinAug 31, 2016
  53. 0/4 cat-file: optionally convert to worktree versionJohannes Schindelin, Sep 9, 2016
  54. 1/4 cat-file: fix a grammo in the man pageJohannes Schindelin, Sep 9, 2016
  55. 3/4 cat-file --textconv/--filters: allow specifying the path separatelyJohannes Schindelin, Sep 9, 2016
  56. Junio C HamanoSep 9, 2016
  57. Johannes SchindelinSep 10, 2016
  58. 4/4 cat-file: support --textconv/--filters in batch modeJohannes Schindelin, Sep 9, 2016
  59. 2/4 cat-file: introduce the --filters optionJohannes Schindelin, Sep 9, 2016
  60. Junio C HamanoSep 9, 2016
  61. Johannes SchindelinSep 9, 2016
  62. Junio C HamanoSep 9, 2016
  63. Junio C HamanoSep 9, 2016
  64. Junio C HamanoSep 9, 2016
  65. Johannes SchindelinSep 10, 2016
  66. Junio C HamanoSep 11, 2016

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.