Re: [PATCH] filter-branch: resolve $commit^{tree} in no-index case

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Jan 19, 2016 at 05:22:53PM -0800, Jonathan Nieder wrote:

> > I'm actually a little iffy on it because it switches to "diff-tree" from
> > a raw-sha1 comparison. For a well-formed repo, that shouldn't matter.
> > But what if you had a commit that was replacing a malformed tree object,
> > but not otherwise changing the diff?  We might drop it as "empty", even
> > though you'd prefer to keep it.
> 
> Mph.  We could get the best of both worlds by introducing a "git
> rev-parse --compare <a> <b>" that compares object ids.  Actually...
> 
> How about something like this?

Thanks. I had in my head that we could do something like that, but
hadn't quite worked it out. I think what you wrote works.

If you want to wrap it up into a patch, I'd be OK with it, but note that
it still falls afoul of changing $tree in a user-visible way (so you
should note that in the commit message).

-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]