From: Constantine Plotnikov Date: Mon, 15 Dec 2008 19:15:40 GMT Subject: Re: [usability bug] git branch -a does not disambiguate remote and local branches Message-ID: <85647ef50812151115k41451d84jcfbdd9a187813e00@mail.gmail.com> In-Reply-To: On Mon, Dec 15, 2008 at 10:09 PM, Johannes Schindelin wrote: > Hi, > > On Mon, 15 Dec 2008, Constantine Plotnikov wrote: > >> Let's consider the following scenario: >> >> mkdir bare.git >> mkdir local >> cd bare.git >> git --bare init >> cd ../local >> git init >> echo test > test.txt >> git add test.txt >> git commit -m test >> git remote add origin `pwd`/../bare.git >> git push --all >> git checkout -b origin/master master >> echo updated > test.txt >> git add test.txt >> git commit -m updated >> >> Note that that in this scenario, the user has created local branch in >> the folder with the same name as a remote branch. While the supposed >> user here is apparently shooting itself in the foot, the scenario is >> still supported by git, and might happen as a result of more logical >> git operations (like git fetch). > > It is only half-supported, and Git will complain, saying that there are > ambiguous branches. > > IMHO it is better to be nice to the many users who do not try to shoot > themselves in the foot, by showing them the nice short names that will > work. > > The others are warned when they use the ambiguous short names anyway. > It is possible to be nice to to both categories showing shortest disambiguated output like: master * heads/origin/master remotes/origin/master Constantine