[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: ‘core-updates’ merge is a squashed commit
From: |
Mathieu Lirzin |
Subject: |
Re: ‘core-updates’ merge is a squashed commit |
Date: |
Thu, 04 Aug 2016 16:45:56 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Hi,
Andreas Enge <address@hidden> writes:
> On Thu, Aug 04, 2016 at 09:23:50AM -0400, Mark H Weaver wrote:
>> I just did this. Huge thanks to Lisa Marie Maginnis, GNU sysadmin
>> extraordinaire, for promptly responding to my plea for help :)
>
> Thanks to both of you!
>
>> However, we should take steps to avoid this problem in the future. The
>> most recent unsigned commit on 'core-updates' was from only 3 days ago,
>> by Andreas. "gnu: unison: Add input ghostscript". I'm fairly sure this
>> was after we added the commit hook, so I guess the hook only applies to
>> 'master'.
>> So, if I understand correctly, we're currently in a state where unsigned
>> commits can accidentally get pushed to other branches, making those
>> branches unmergeable into 'master'.
>
> Sorry for that! I did not think it would be possible, and working locally
> without signing every private commit is much more convenient.
With gpg-agent and git properly setup, signing every local commit is not
that inconvenient IME.
I recommend you to give a try. ;)
--
Mathieu Lirzin
- ‘core-updates’ merge is a squashed commit, (continued)
- ‘core-updates’ merge is a squashed commit, Ludovic Courtès, 2016/08/03
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/03
- Re: ‘core-updates’ merge is a squashed commit, Mark H Weaver, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andreas Enge, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Mark H Weaver, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andreas Enge, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Mark H Weaver, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Ludovic Courtès, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andreas Enge, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit,
Mathieu Lirzin <=
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andreas Enge, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andreas Enge, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andy Wingo, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andy Wingo, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andy Wingo, 2016/08/05
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/05