Re: Couple of read-tree questions
Daniel Barkalow <[EMAIL PROTECTED]> writes: > (The thread you mention seems to say that we accept entries being missing > from the index as if they were unchanged, but I don't see a good reason > for this; you'd be dealing with the full set in the index for the merge, > even if you don't have a populated working tree) You are correct. I was wondering myself why *both* of us thought (or Linus *seemed* to be agreeing, at least to me) what I was referring to as I+H made any sense while re-reaing the thread. > I should have asked sooner, then. :) There's a bunch of clutter to get it > to work that I can remove if it's not actually necessary. Yeah, removal of dead code! Go wild, please. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Couple of read-tree questions
On Wed, 31 Aug 2005, Junio C Hamano wrote: > Daniel Barkalow <[EMAIL PROTECTED]> writes: > > > Is there any current use for read-tree with multiple trees without -m or > > equivalent? > > I did not know it even allowed multiple trees without -m, but > you are right. It does not seem to complain. > > I have never thought about using multiple trees without -m, and > I do not remember hearing any plan nor purpose of using it to do > something interesting from Linus. I think its allowing multiple > trees without -m is simply a bug. I guess it was probably that its behavior was obvious and didn't require any extra code. It still follows entirely from one tree without -m, but it might be worth prohibiting unless someone has a reason to do it intentionally. > > Why does --emu23 use I+H for stage 2, rather than just I? Wouldn't this > > just reintroduce removed files? > > They are not "removed files", at least in the original context. > > The original intention was that git was supposed to work without > having _any_ files in the working tree. The reason why > multi-tree read-tree has so many special cases that says "must > match *if* work file exists", is that not having a corresponding > working file was supposed to be equivalent to having the file > checked out *and* unmodified. But they'd not only be missing from the working tree but also from the (pre-read-tree) index, which should only happen, assuming the index came from "read-tree H", if they were subsequently removed from the index. I'd understand treating index entries for files missing from the working tree as up to date. (The thread you mention seems to say that we accept entries being missing from the index as if they were unchanged, but I don't see a good reason for this; you'd be dealing with the full set in the index for the merge, even if you don't have a populated working tree) > I do not think anybody currently uses --emu23. I did it because > it has a potential of making the two-tree fast forward (which is > used in "git checkout" to switch between branches) easier to > manage when the working tree is dirty than doing straight > two-tree merge, but that is just a theoretical potential never > tested in the field. Frankly, I do not mind, and I do not think > anybody else minds, too much if you need to break or remove > emu23 if that would make your code clean-up and redoing > read-tree easier. I should have asked sooner, then. :) There's a bunch of clutter to get it to work that I can remove if it's not actually necessary. -Daniel *This .sig left intentionally blank* - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Couple of read-tree questions
Junio C Hamano <[EMAIL PROTECTED]> writes: >> Why does --emu23 use I+H for stage 2, rather than just I? Wouldn't this >> just reintroduce removed files? > > They are not "removed files", at least in the original context. > > The original intention was... Gmane turns out to be better remembering things than my faulty memory. The thread beginning here is a good summary of the thinking behind the current design: http://article.gmane.org/gmane.comp.version-control.git/4737 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Couple of read-tree questions
Daniel Barkalow <[EMAIL PROTECTED]> writes: > Is there any current use for read-tree with multiple trees without -m or > equivalent? I did not know it even allowed multiple trees without -m, but you are right. It does not seem to complain. I have never thought about using multiple trees without -m, and I do not remember hearing any plan nor purpose of using it to do something interesting from Linus. I think its allowing multiple trees without -m is simply a bug. > Why does --emu23 use I+H for stage 2, rather than just I? Wouldn't this > just reintroduce removed files? They are not "removed files", at least in the original context. The original intention was that git was supposed to work without having _any_ files in the working tree. The reason why multi-tree read-tree has so many special cases that says "must match *if* work file exists", is that not having a corresponding working file was supposed to be equivalent to having the file checked out *and* unmodified. That assumption and design goal was partially broken at around the beginning of June when we started touching working tree during a merge. Until that timeframe, we did not touch (nor even look at) files in the working tree during the merge, mainly due to the desire of performing the merge operation entirely in the cache (which was the name of "index file" back then). I do not think anybody currently uses --emu23. I did it because it has a potential of making the two-tree fast forward (which is used in "git checkout" to switch between branches) easier to manage when the working tree is dirty than doing straight two-tree merge, but that is just a theoretical potential never tested in the field. Frankly, I do not mind, and I do not think anybody else minds, too much if you need to break or remove emu23 if that would make your code clean-up and redoing read-tree easier. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
