unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Famulari <leo@famulari.name>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: Re: ‘core-updates’ merge is a squashed commit
Date: Wed, 3 Aug 2016 17:10:32 -0400	[thread overview]
Message-ID: <20160803211032.GA6034@jasmine> (raw)
In-Reply-To: <87wpjxy4ta.fsf_-_@gnu.org>

On Wed, Aug 03, 2016 at 10:29:21PM +0200, Ludovic Courtès wrote:
> In fact, commit 455859a50f88f625d13fc2f304111f02369b366b, which is the
> core-updates merge, is *not* a merge commit.  Instead it seems to be a
> squashed commit of all of core-updates.  Consequently, part of the
> history of the files touched by this merge is squashed into this single
> pseudo-merge commit.  :-/

Dang, that means we lost the commit history of core-updates. It won't be
in the Git log.

> This can be fixed locally with a graft to give the merge commit the two
> parents it is supposed to have:
> 
>   git replace --graft 455859a50f88f625d13fc2f304111f02369b366b \
>      742effef5629667b274087adc70b06abab86b252 a8cb87abe98d57fb763d5b14524dc32c96bd31b5 

I tried this and Git said "fatal: could not parse a8cb87abe98d57fb763d5b14524dc32c96bd31b5"

I don't have a Git object of that name in my repo.

  reply	other threads:[~2016-08-03 21: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 [this message]
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
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=20160803211032.GA6034@jasmine \
    --to=leo@famulari.name \
    --cc=guix-devel@gnu.org \
    --cc=ludo@gnu.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).