From: Shawn O. Pearce Date: Tue, 19 Aug 2008 14:24:45 GMT Subject: Re: [JGIT PATCH 00/14] TreeWalk D/F conflict detection Message-ID: <20080819142445.GB20947@spearce.org> In-Reply-To: <1219135931.3184.473.camel@pmac.infradead.org> David Woodhouse wrote: > 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.