From: Jeff King Date: Sat, 09 Feb 2008 03:00:46 GMT Subject: Re: Minor annoyance with git push Message-ID: <20080209030046.GA10470@coredump.intra.peff.net> In-Reply-To: <46a038f90802072044u3329fd33w575c689cba2917ee@mail.gmail.com> On Fri, Feb 08, 2008 at 05:44:12PM +1300, Martin Langhoff wrote: > This means that beyond the branches I actively work on, I also have > local tracking branches for remote heads that I am not updating. When > I say git push, these stale local tracking branches are making a lot > of noise in the output: > > To git+ssh://git.catalyst.net.nz/var/git/moodle-r2.git > ! [rejected] mdl17-ceo -> mdl17-ceo (non-fast forward) > ! [rejected] mdl18-local -> mdl18-local (non-fast forward) > ! [rejected] mdl18-masseyedu-wimbatest -> > mdl18-masseyedu-wimbatest (non-fast forward) > ! [rejected] mdl18-nmit -> mdl18-nmit (non-fast forward) > ! [rejected] mdl18-proxy -> mdl18-proxy (non-fast forward) > ! [rejected] mdl18-shared -> mdl18-shared (non-fast forward) > ! [rejected] mdl18-sqm -> mdl18-sqm (non-fast forward) > ! [rejected] mdl18-stcuthberts -> mdl18-stcuthberts (non-fast forward) > ! [rejected] mdl18-topnz -> mdl18-topnz (non-fast forward) > ! [rejected] mdl19-dbperf -> mdl19-dbperf (non-fast forward) > ! [rejected] mdl19-ucol -> mdl19-ucol (non-fast forward) > ! [rejected] mdl19-uow -> mdl19-uow (non-fast forward) > error: failed to push to 'git+ssh://git.catalyst.net.nz/var/git/moodle-r2.git' Thinking about this more, this situation is more than a minor annoyance: it is actually somewhat dangerous. If you ever wanted to push _one_ non-ff case (say, for your current branch) and you were to use "git push -f", you would rewind history for random branches, and sorting the mess out at the remote could be awful (especially if it is a bare repo without reflogs). I really think that Steffen's "default to pushing only the current branch" approach fits much better with the model described in your workflow, and is generally a safer default. IIRC, the main objection was that old-timers like the current push behavior better. Steffen, was there objection to a "push.onlyHEAD" config option? -Peff