From: Petr Baudis Date: Wed, 22 Mar 2006 11:52:18 GMT Subject: Re: What's in git.git Message-ID: <20060322115218.GT18185@pasky.or.cz> In-Reply-To: <7vodzzb5q3.fsf@assigned-by-dhcp.cox.net> Dear diary, on Wed, Mar 22, 2006 at 02:58:28AM CET, I got a letter where Junio C Hamano said that... > When --use-separate-remote is in effect, the tracking > branches are created in $GIT_DIR/refs/remotes/origin/ and you > will not get the extra "origin" head. Your local branch > namespace under $GIT_DIR/refs/heads/ will only have "master". > In addition, a symref $GIT_DIR/refs/remotes/origin/HEAD > points at the primary branch of the remote repository. > Similar to a filename in $GIT_DIR/refs/{heads,tags} that can > be used to name a ref (e.g. when you say "git diff frotz", > you are telling git to read from $GIT_DIR/refs/heads/frotz > and use that commit ID to diff your working tree against), a > directory that has such a symref under $GIT_DIR/refs/remotes > can be used to name the ref. IOW, "git diff origin" in a > repository a cloned this way means you want a diff against > $GIT_DIR/refs/remotes/origin/HEAD. Sounds very good. > A new configuration option, 'core.warnambiguousrefs', can be > set to warn you if you use "frotz" to name a ref when you > have more than one "frotz" under $GIT_DIR/refs (e.g. you have > both branch "frotz" and tag "frotz", and/or you have > refs/remotes/frotz/HEAD). Is there any reason why this isn't enabled by default? -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Right now I am having amnesia and deja-vu at the same time. I think I have forgotten this before.