git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH 0/1] [v2.23.0 BUG] commit-graph: fix bug around octopus merges
@ 2019-08-05 16:43 Derrick Stolee via GitGitGadget
  2019-08-05 16:43 ` [PATCH 1/1] " Derrick Stolee via GitGitGadget
  0 siblings, 1 reply; 5+ messages in thread
From: Derrick Stolee via GitGitGadget @ 2019-08-05 16:43 UTC (permalink / raw)
  To: git; +Cc: peff, avarab, jrnieder, steadmon, Junio C Hamano

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

[1] https://public-inbox.org/git/pull.184.v6.git.gitgitgadget@gmail.com/

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

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


base-commit: 5b15eb397d176c557a82e872d6b4043aa7589874
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-308%2Fderrickstolee%2Fcommit-graph-octopus-bug-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-308/derrickstolee/commit-graph-octopus-bug-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/308
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-08-06 15:19 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-05 16:43 [PATCH 0/1] [v2.23.0 BUG] commit-graph: fix bug around octopus merges Derrick Stolee via GitGitGadget
2019-08-05 16:43 ` [PATCH 1/1] " 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

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.version-control.git
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.version-control.git
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git