From: Matthieu Moy Date: Sat, 17 Mar 2012 20:46:51 GMT Subject: Re: [RFC PATCH] push: start warning upcoming default change for push.default Message-ID: In-Reply-To: <20120316214832.GB25092@ecki> Clemens Buchacher writes: > On Fri, Mar 16, 2012 at 01:42:36PM +0100, Matthieu Moy wrote: >> Junio C Hamano writes: >> >> > Matthieu Moy writes: >> > >> >> I'd count "upstream is not set" as "current and upstream agree on >> >> 'current'". IOW, use "current", but error out if there's a configured >> >> upstream that is different. >> > >> > And if there is no configured upstream, should it error out, or should it >> > just push the current one to its own name? >> >> I meant just push the current one to its own name. > > Altough in a somewhat rarer case, this has the same problem as > "current": > > git checkout -b master origin/master > git checkout -b topic master > git push > > If a branch called topic already exists on origin, push will now try to > update it with the local branch topic. But they do not have any clear > connection, except for the name. Yes, but the user can hardly expect anything else here. So, it may be a (user) mistake, but it's not a surprise. BTW, 'matching' also has this drawback, and I never saw anyone complain about it (maybe I didn't listen enough though). -- Matthieu Moy http://www-verimag.imag.fr/~moy/