Re: Cleaning up git user-interface warts
- From
- Michael K. Edwards <medwards.linux@gmail.com>
- Date
- Nov 18, 2006, 01:24 UTC
- Message-ID
- <f2b55d220611171724u616ac6ft300abd066682ef22@mail.gmail.com>
- In-Reply-To
- <7v64dev88t.fsf@assigned-by-dhcp.cox.net>
On 11/16/06, Junio C Hamano <junkio@cox.net> wrote:
Show 12 quoted lines
> "Michael K. Edwards" <medwards.linux@gmail.com> writes: > > > Presumably "git branch -D" should inspect everything under > > .git/remotes to see whether one or more Pull: lines need to be > > deleted along with the branch. > > I am not sure what you mean. .git/remotes files do not describe > any relationship between local branches (and that is where one > of the problem raised in recent thread -- pull does not notice > on which branch you are on and change its behaviour depending on > it), so I do not think there is anything gained for "git branch > -D" by going through them.
.git/remotes/foo does contain Pull: lines which indicate the local branch onto which to _fetch_ remote changes. It's the subsequent _merge_ that doesn't notice which branch you have checked out.
Cheers,