mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Derrick Stolee via GitGitGadget" <>
Cc:,,,, Junio C Hamano <>
Subject: [PATCH 0/1] [v2.23.0 BUG] commit-graph: fix bug around octopus merges
Date: Mon, 05 Aug 2019 09:43:40 -0700 (PDT)	[thread overview]
Message-ID: <> (raw)

I come, hat in hand, with a bug-fix for a bug that I wrote. I just happened
to discover this issue while playing around with turning the commit-graph on
by default and stumbled into this warning.

Please see the commit message for full details, but putting octopus merges
in a tip commit-graph file in the incremental format [1] would cause the
file to not load because Git thinks the base commit-graphs do not have the
right hashes.

It is very likely that a more careful patch would allow this warning to
become an error during git commit-graph verify, but I wanted to minimize the
change for this quick bug fix.

Thanks, -Stolee


Derrick Stolee (1):
  commit-graph: fix bug around octopus merges

 commit-graph.c                | 2 +-
 t/ | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

base-commit: 5b15eb397d176c557a82e872d6b4043aa7589874
Fetch-It-Via: git fetch pr-308/derrickstolee/commit-graph-octopus-bug-v1

             reply	other threads:[~2019-08-05 16:43 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-05 16:43 Derrick Stolee via GitGitGadget [this message]
2019-08-05 16:43 ` [PATCH 1/1] commit-graph: fix bug around octopus merges Derrick Stolee via GitGitGadget
2019-08-06  9:21   ` SZEDER Gábor
2019-08-06 12:03     ` Derrick Stolee
2019-08-06 15:19       ` SZEDER Gábor

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:

  List information:

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

  git send-email \ \ \ \ \ \ \ \ \

* 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

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).