From: Petr Baudis Date: Thu, 23 Nov 2006 23:42:03 GMT Subject: Re: [PATCH] Make git-clone --use-separate-remote the default Message-ID: <20061123234203.GN7201@pasky.or.cz> In-Reply-To: <7vejrtiwqd.fsf@assigned-by-dhcp.cox.net> On Fri, Nov 24, 2006 at 12:12:10AM CET, Junio C Hamano wrote: > Petr Baudis writes: > > > and --use-immingled-remote can be used to get the original behaviour; > > it is also implied by --bare. > > What's immingled? One dictionary says Immingle \Im*min"gle\, v. t. To mingle; to mix; to unite; to blend. [R.] --Thomson. but perhaps it's too much an obscure word... better suggestions welcomed. > > We get confused, frustrated and data-losing users *daily* on #git now > > because git-clone still produces the crippled repositories having the > > remote and local heads freely mixed together. > > > > Signed-off-by: Petr Baudis > > Being strongly opinionated, not giving enough credit for the > evolutionary process behind the history and venting frustration > in the proposed commit log message is never a good strategy to > get the patch applied. Yes, sorry, the last days were a bit tiring to me. I'm not sure what evolutionary process should I describe, though... > Even though I fully agree that use-separate-remotes should be > the default, to the point that I do not think we do not even > need a backward compatibility option. People who want to use > traditional layout for simple one-remote-branch-only project > would not suffer anyway because 'origin' still means origin in > the new layout (refs/remotes/origin/HEAD). I don't know, we still at least need to keep the functionality for --bare. > We would need to update the tutorials to match this,though. I > think it talks about the traditional layout and say 'See, now > you can run "ls .git/refs/heads/{master,origin}"' or something > like that. Oops, yes. I can try to go through the tutorials during tomorrow or the next week... -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ The meaning of Stonehenge in Traflamadorian, when viewed from above, is: "Replacement part being rushed with all possible speed."