From: Per Cederqvist <cederp@opera.com>
To: Junio C Hamano <gitster-vger@pobox.com>
Cc: git@vger.kernel.org, ceder@lysator.liu.se
Subject: Re: [GUILT] Preventing "git push" when guilt patches are applied
Date: Mon, 30 Apr 2012 12:34:46 +0200 [thread overview]
Message-ID: <4F9E6AC6.9070606@opera.com> (raw)
In-Reply-To: <CAPc5daV4mK7aLRAm4Ow9TBPf5Tj3B=Qpf0=cRXjbeZoOuoYMKQ@mail.gmail.com>
On 04/19/2012 05:19 PM, Junio C Hamano wrote:
> 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?
It wasn't obvious to me, but I think it is a good idea. I've posted
an implementation of this here:
http://thread.gmane.org/gmane.comp.version-control.git/196546
> 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.
That would maybe help me, but I would still be reluctant to recommend
Guilt to my friends, as I don't want to be the reason they make stupid
mistakes. :-)
/ceder
prev parent reply other threads:[~2012-04-30 10:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-19 7:23 [GUILT] Preventing "git push" when guilt patches are applied Per Cederqvist
2012-04-19 15:19 ` Junio C Hamano
2012-04-30 10:34 ` Per Cederqvist [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F9E6AC6.9070606@opera.com \
--to=cederp@opera.com \
--cc=ceder@lysator.liu.se \
--cc=git@vger.kernel.org \
--cc=gitster-vger@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.