unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Andreas Enge <andreas@enge.fr>
To: Mark H Weaver <mhw@netris.org>
Cc: guix-devel@gnu.org
Subject: Re: ‘core-updates’ merge is a squashed commit
Date: Thu, 4 Aug 2016 16:10:16 +0200	[thread overview]
Message-ID: <20160804141016.GA6889@solar> (raw)
In-Reply-To: <87vazgy8ex.fsf@netris.org>

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.

Indeed, I just pushed an unsigned commit to a new branch, and it worked.

This is strange: The update hook should work with any branch, and not
only master. Maybe it is the way it has been set up at savannah?

Andreas

  parent reply	other threads:[~2016-08-04 14:10 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-01  8:19 Core-updates Andreas Enge
2016-08-01 21:48 ` core-updates merged! Ludovic Courtès
2016-08-02 13:26   ` ng0
2016-08-02 17:32     ` Ludovic Courtès
2016-08-02 17:48       ` Leo Famulari
2016-08-02 21:28         ` Ludovic Courtès
2016-08-03  4:04           ` Leo Famulari
2016-08-03 16:42             ` Ludovic Courtès
2016-08-03 17:24               ` Leo Famulari
2016-08-03 17:56                 ` Ludovic Courtès
2016-08-03 18:39                   ` Leo Famulari
2016-08-03 20:01                     ` Ludovic Courtès
2016-08-03 21:01                       ` Leo Famulari
2016-08-03 21:27                         ` Andreas Enge
2016-08-03 22:14                           ` Leo Famulari
2016-08-03 20:29                     ` ‘core-updates’ merge is a squashed commit Ludovic Courtès
2016-08-03 21:10                       ` Leo Famulari
2016-08-04  7:50                         ` Mark H Weaver
2016-08-04  8:24                           ` Andreas Enge
2016-08-04 12:36                             ` Mark H Weaver
2016-08-04 12:40                               ` Andreas Enge
2016-08-04 13:04                                 ` Leo Famulari
2016-08-04 13:23                                   ` Mark H Weaver
2016-08-04 14:07                                     ` Ludovic Courtès
2016-08-04 14:10                                     ` Andreas Enge [this message]
2016-08-04 14:45                                       ` Mathieu Lirzin
2016-08-04 16:37                                         ` Leo Famulari
2016-08-04 18:32                                           ` Andreas Enge
2016-08-04 20:06                                             ` Leo Famulari
2016-08-04 18:34                                         ` Andreas Enge
2016-08-04 15:06                               ` Andy Wingo
2016-08-04 16:44                                 ` Leo Famulari
2016-08-04 16:55                                   ` Andy Wingo
2016-08-04 20:05                                     ` Leo Famulari
2016-08-05  7:35                                       ` Andy Wingo
2016-08-05 14:59                                         ` Leo Famulari
2016-08-05 16:50                                           ` Andy Wingo
2016-08-05 17:11                                             ` Leo Famulari
2016-08-06  0:59                                               ` Mark H Weaver
2016-08-06  2:07                                                 ` Leo Famulari
2016-08-08  7:38                                                   ` Andy Wingo
2016-08-06  7:52                                                 ` Andreas Enge
2016-08-08  7:46                                                   ` Andy Wingo
2016-08-07  6:16                                 ` Mike Gerwitz
2016-08-04 11:41                           ` Leo Famulari
2016-08-06 14:42             ` core-updates merged! Leo Famulari
2016-08-10 19:49               ` Leo Famulari
2016-08-13  7:15                 ` Manolis Ragkousis
2016-08-13 23:20                   ` Core-updates is ready for your patches! Leo Famulari
2016-08-09  3:07           ` core-updates merged! Leo Famulari

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

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160804141016.GA6889@solar \
    --to=andreas@enge.fr \
    --cc=guix-devel@gnu.org \
    --cc=mhw@netris.org \
    /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. 
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).