From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Edward Thomson <ethomson@edwardthomson.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH 0/3] xdiff: handle allocation failures
Date: Wed, 09 Feb 2022 10:59:12 +0000 [thread overview]
Message-ID: <pull.1140.git.1644404356.gitgitgadget@gmail.com> (raw)
Other users of xdiff such as libgit2 need to be able to handle allocation
failures. This series fixes the few cases where we are not doing this
already.
Edward's patch[1] reminded me that I had these waiting to be submitted.
[1] https://lore.kernel.org/git/20220209013354.GB7@abe733c6e288/
Phillip Wood (3):
xdiff: handle allocation failure in patience diff
xdiff: refactor a function
xdiff: handle allocation failure when merging
xdiff/xmerge.c | 44 ++++++++++++++++++++++++--------------------
xdiff/xpatience.c | 17 ++++++++++++-----
2 files changed, 36 insertions(+), 25 deletions(-)
base-commit: 38062e73e009f27ea192d50481fcb5e7b0e9d6eb
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1140%2Fphillipwood%2Fwip%2Fxdiff-handle-allocation-failures-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1140/phillipwood/wip/xdiff-handle-allocation-failures-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1140
--
gitgitgadget
next reply other threads:[~2022-02-09 11:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-09 10:59 Phillip Wood via GitGitGadget [this message]
2022-02-09 10:59 ` [PATCH 1/3] xdiff: handle allocation failure in patience diff Phillip Wood via GitGitGadget
2022-02-09 10:59 ` [PATCH 2/3] xdiff: refactor a function Phillip Wood via GitGitGadget
2022-02-09 18:04 ` Junio C Hamano
2022-02-10 6:28 ` Junio C Hamano
2022-02-11 15:19 ` Phillip Wood
2022-02-11 16:46 ` Junio C Hamano
2022-02-09 10:59 ` [PATCH 3/3] xdiff: handle allocation failure when merging Phillip Wood via GitGitGadget
2022-02-16 10:15 ` [PATCH v2 0/4] xdiff: handle allocation failures Phillip Wood via GitGitGadget
2022-02-16 10:15 ` [PATCH v2 1/4] xdiff: fix a memory leak Phillip Wood via GitGitGadget
2022-02-16 10:28 ` Ævar Arnfjörð Bjarmason
2022-02-16 13:49 ` Phillip Wood
2022-02-16 14:38 ` Ævar Arnfjörð Bjarmason
2022-02-16 16:55 ` Junio C Hamano
2022-02-17 11:05 ` Phillip Wood
2022-02-16 10:15 ` [PATCH v2 2/4] xdiff: handle allocation failure in patience diff Phillip Wood via GitGitGadget
2022-02-16 10:15 ` [PATCH v2 3/4] xdiff: refactor a function Phillip Wood via GitGitGadget
2022-02-16 10:15 ` [PATCH v2 4/4] xdiff: handle allocation failure when merging Phillip Wood via GitGitGadget
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.1140.git.1644404356.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=ethomson@edwardthomson.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood@dunelm.org.uk \
/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 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 NNTP newsgroup(s).