All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: John Keeping <john@keeping.me.uk>
Cc: authmillenon@riot-os.org, git@vger.kernel.org
Subject: Re: Feature request: Configurable prefixes for git commit --fixup and --squash
Date: Thu, 03 Mar 2016 14:58:09 +0100	[thread overview]
Message-ID: <vpqio13ll3i.fsf@anie.imag.fr> (raw)
In-Reply-To: <20160303132128.GE1766@serenity.lan> (John Keeping's message of "Thu, 3 Mar 2016 13:21:28 +0000")

John Keeping <john@keeping.me.uk> writes:

> On Thu, Mar 03, 2016 at 01:47:00PM +0100, Martine Lenders wrote:
>> I'm not sure if this was already requested somewhere (a quick - but
>> admittedly not thorough - search did not reveal anything in that
>> direction), but I really miss an option to configure the prefixes generated
>> by `git commit (--fixup | --squash) <commit>` and picked up by `git rebase
>> -i --autosquash`.
>> 
>> My reasoning is that in our project we use GitHub + Travis to test-build
>> our pull requests, but we don't want to spam the CI server with builds that
>> are just fixups to previous changes (which are uploaded so reviewers can
>> track the changes to the original PR). Now, Travis has the option to not
>> build a commit if there is the string `[ci skip]` in the commit message
>> (sadly also not configurable) so it would be really great for my workflow
>> if I could just add this string to the message generated by `--fixup`.
>
> I am against the feature as you describe it, because it has the
> potential to break `git rebase --autosquash` with shared fixups if two
> people are using a different prefix.
>
> However, it sounds like Travis will recognize "[ci skip]" anywhere in
> the commit message.  Would a feature to allow autogenerated content in
> fixup/squash commit message bodies work?

Or, alternatively: change the script used by Travis-CI to do something
like

case "$(head -n 1 "$1")" in
"fixup! "*|"squash! "*)
	: do nothing
        ;;
*)
	launch_real_tests
esac

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

  reply	other threads:[~2016-03-03 13:58 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-03 12:47 Feature request: Configurable prefixes for git commit --fixup and --squash Martine Lenders
2016-03-03 13:21 ` John Keeping
2016-03-03 13:58   ` Matthieu Moy [this message]
2016-03-03 14:38     ` Martine Lenders
2016-03-03 14:52       ` Matthieu Moy
2016-03-03 14:33   ` Martine Lenders
2016-03-03 14:44     ` John Keeping
2016-03-03 15:59     ` Matthieu Moy
2016-03-03 16:48       ` Martine Lenders
2016-03-03 17:09         ` Matthieu Moy
2016-03-03 17:23           ` Junio C Hamano
2016-03-03 17:34             ` Matthieu Moy

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=vpqio13ll3i.fsf@anie.imag.fr \
    --to=matthieu.moy@grenoble-inp.fr \
    --cc=authmillenon@riot-os.org \
    --cc=git@vger.kernel.org \
    --cc=john@keeping.me.uk \
    /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.