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

Re: [JGIT PATCH 00/14] TreeWalk D/F conflict detection

From
Shawn O. Pearce <spearce@spearce.org>
Date
Aug 19, 2008, 14:24 UTC
Message-ID
<20080819142445.GB20947@spearce.org>
In-Reply-To
<1219135931.3184.473.camel@pmac.infradead.org>
David Woodhouse <dwmw2@infradead.org> wrote:
Show 7 quoted lines
> On Mon, 2008-08-18 at 16:53 -0700, Shawn O. Pearce wrote:
> > This series is about fixing the "mistake" in Git trees where
> > subtrees sort as through their name is "path/" and not "path".
> 
> Er, really? Does that mean this commit is broken, then?
> 
> http://git.kernel.org/?p=linux/kernel/git/dwmw2/misc-git-hacks.git;a=commitdiff;h=fc1b73da
Yes, that is broken.
 
> I shouldn't need to know that -- I'd _really_ like a version of
> 'git-hash-object -t tree' which validates and sorts its input for me.
> And maybe even takes input in _text_ form, so I don't have to convert
> the sha1 to binary.

Try `git mktree` instead. It uses a text form, and it corrects the sorting for you. Though funny names that contain an LF may be harder to send to mktree.

-- 
Shawn.
Previous: David Woodhouse
Message 20 of 20 in “TreeWalk D/F conflict detection”
  1. 00/14 TreeWalk D/F conflict detectionShawn O. Pearce, Aug 18, 2008
  2. 01/14 Detect path names which overflow the name length field in the indexShawn O. Pearce, Aug 18, 2008
  3. 02/14 Fix NB.decodeUInt16 to correctly handle the high byteShawn O. Pearce, Aug 18, 2008
  4. 03/14 Add test cases for NB.encode and NB.decode family of routinesShawn O. Pearce, Aug 18, 2008
  5. 04/14 Fix DirCache's skip over null byte padding when reading a DIRC fileShawn O. Pearce, Aug 18, 2008
  6. 05/14 Fix usage of assertEquals in DirCacheIteratorTestShawn O. Pearce, Aug 18, 2008
  7. 06/14 Refactor AbstractTreeIterator.pathCompare to force another modeShawn O. Pearce, Aug 18, 2008
  8. 07/14 Micro-optimize AbstractTreeIterator.pathCompareShawn O. Pearce, Aug 18, 2008
  9. 08/14 Optimize path comparsion within subtrees during TreeWalkShawn O. Pearce, Aug 18, 2008
  10. 09/14 Refactor AbstractTreeIterator semantics to start on first entryShawn O. Pearce, Aug 18, 2008
  11. 10/14 Make all AbstractTreeIterator implementations bi-directionalShawn O. Pearce, Aug 18, 2008
  12. 11/14 Expose beginning of iterator indication from AbstractTreeIteratorShawn O. Pearce, Aug 18, 2008
  13. 12/14 Allow application code to set ObjectIds in DirCacheEntryShawn O. Pearce, Aug 18, 2008
  14. 13/14 Create NameConflictTreeWalk to transparently detect D/F conflictsShawn O. Pearce, Aug 18, 2008
  15. 14/14 Add test case for NameConflictTreeWalkShawn O. Pearce, Aug 18, 2008
  16. Junio C HamanoAug 19, 2008
  17. Robin RosenbergAug 19, 2008
  18. Shawn O. PearceAug 19, 2008
  19. David WoodhouseAug 19, 2008
  20. Shawn O. PearceAug 19, 2008

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.