From: "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: peff@peff.net, brad@brad-smith.co.uk, sunshine@sunshineco.com,
Derrick Stolee <dstolee@microsoft.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/3] Fix two bugs in graph.c
Date: Tue, 07 Jan 2020 14:55:44 +0000 [thread overview]
Message-ID: <pull.517.git.1578408947.gitgitgadget@gmail.com> (raw)
This is a possible fix for the bug reported in [1].
The first commit fixes the runtime failure due to the assert() statement.
The second commit replaces the assert() statements with a macro that
triggers a BUG().
The third commit adds another test that shows a more complicated example and
how the new code in v2.25.0-rc1 has a behavior change that is not
necessarily wanted.
Thanks, -Stolee
[1]
https://lore.kernel.org/git/CAHt=fUXTHc4JPsapvHKnw5vHhp2cBOYRNfdaSDWBUnKt8fWfeA@mail.gmail.com/
Derrick Stolee (3):
graph: fix case that hit assert()
graph: replace assert() with graph_assert() macro
t4215: add bigger graph collapse test
graph.c | 39 +++++++------
t/t4215-log-skewed-merges.sh | 105 +++++++++++++++++++++++++++++++++++
2 files changed, 126 insertions(+), 18 deletions(-)
base-commit: 8679ef24ed64018bb62170c43ce73e0261c0600a
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-517%2Fderrickstolee%2Fgraph-assert-fix-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-517/derrickstolee/graph-assert-fix-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/517
--
gitgitgadget
next reply other threads:[~2020-01-07 14:55 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 14:55 Derrick Stolee via GitGitGadget [this message]
2020-01-07 14:55 ` [PATCH 1/3] graph: fix case that hit assert() Derrick Stolee via GitGitGadget
2020-01-07 15:30 ` Jeff King
2020-01-07 18:47 ` Derrick Stolee
2020-01-07 19:21 ` Junio C Hamano
2020-01-07 19:31 ` Jeff King
2020-01-07 20:21 ` Junio C Hamano
2020-01-07 14:55 ` [PATCH 2/3] graph: replace assert() with graph_assert() macro Derrick Stolee via GitGitGadget
2020-01-07 15:36 ` Jeff King
2020-01-07 15:51 ` Eric Sunshine
2020-01-07 18:45 ` Derrick Stolee
2020-01-07 14:55 ` [PATCH 3/3] t4215: add bigger graph collapse test Derrick Stolee via GitGitGadget
2020-01-07 15:39 ` Jeff King
2020-01-07 18:02 ` Junio C Hamano
2020-01-07 18:04 ` Jeff King
2020-01-07 18:44 ` Derrick Stolee
2020-01-07 17:13 ` [PATCH 0/3] Fix two bugs in graph.c Junio C Hamano
2020-01-07 21:27 ` [PATCH v2 0/2] " Derrick Stolee via GitGitGadget
2020-01-07 21:27 ` [PATCH v2 1/2] graph: fix case that hit assert() Derrick Stolee via GitGitGadget
2020-01-07 21:50 ` Junio C Hamano
2020-01-08 17:34 ` Junio C Hamano
2020-01-08 19:14 ` Derrick Stolee
2020-01-07 21:27 ` [PATCH v2 2/2] graph: fix lack of color in horizontal lines Derrick Stolee via GitGitGadget
2020-01-07 21:51 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.517.git.1578408947.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=brad@brad-smith.co.uk \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.