From: Junio C Hamano <gitster-vger@pobox.com>
Date: Thu, 19 Apr 2012 15:19:58 GMT
Subject: Re: [GUILT] Preventing "git push" when guilt patches are applied
Message-ID: <CAPc5daV4mK7aLRAm4Ow9TBPf5Tj3B=Qpf0=cRXjbeZoOuoYMKQ@mail.gmail.com>
In-Reply-To: <4F8FBD63.9050507@opera.com>

On Thu, Apr 19, 2012 at 12:23 AM, Per Cederqvist <cederp@opera.com> wrote:
> I have by accident done "git push" when I intended to write "guilt
> push" a couple of times.  If there are guilt patches applied when I do
> this the result is that (part of) my half-finished patch series is
> pushed to the master branch.  That is of course not good.
>
> TopGit avoids this issue since I'm on a separate branch when patches
> are applied.
> ...
> I'd like to add something similar to Guilt, to avoid making this
> mistake ever again.  (It is quite embarrassing to clean up after you
> push a couple of half-baked patches.)  But I don't know how the
> feature should be designed.  Some ideas:
> ...

Isn't the most obvious one (somehow missing from your list) from your
observation you
described earlier to have guilt apply patches on a separate branch?

Would it also work to set "[push] default = none"?  Then "git push"
typed by mistake for
"guilt push" (I am assuming that "$whichever push" does not take any
other argument,
and that is the root cause of your fat-finger-embarrassment issue)
would not push anything
out.