From: Phillip Wood <phillip.wood123@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v2 1/1] sequencer: fix empty commit check when amending
Date: Sat, 23 Nov 2019 09:54:49 +0000 [thread overview]
Message-ID: <340859a7-5cc4-f641-818d-fcedbf29a2a6@gmail.com> (raw)
In-Reply-To: <xmqq5zjb2vsx.fsf@gitster-ct.c.googlers.com>
Hi Junio
On 23/11/2019 02:03, Junio C Hamano wrote:
> "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> + if (!(flags & ALLOW_EMPTY)) {
>> + struct commit *first_parent = current_head;
>> +
>> + if (flags & AMEND_MSG) {
>> + if (current_head->parents) {
>
> It is not apparent to me that somebody guarantees that this access
> is safe; would we need to do things differently when !current_head?
That's a good point, I'll fix it, thanks for catching this
Best Wishes
Phillip
>
>> + first_parent = current_head->parents->item;
>> + if (repo_parse_commit(r, first_parent)) {
>> + res = error(_("could not parse HEAD commit"));
>> + goto out;
>> + }
>> + } else {
>> + first_parent = NULL;
>> + }
>> + }
next prev parent reply other threads:[~2019-11-23 9:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 14:06 [PATCH 0/1] sequencer: fix empty commit check when amending Phillip Wood via GitGitGadget
2019-11-21 14:06 ` [PATCH 1/1] " Phillip Wood via GitGitGadget
2019-11-22 6:40 ` Junio C Hamano
2019-11-22 11:01 ` Phillip Wood
2019-11-22 6:52 ` Junio C Hamano
2019-11-22 11:09 ` Phillip Wood
2019-11-22 19:43 ` [PATCH v2 0/1] " Phillip Wood via GitGitGadget
2019-11-22 19:43 ` [PATCH v2 1/1] " Phillip Wood via GitGitGadget
2019-11-23 2:02 ` Junio C Hamano
2019-11-23 2:03 ` Junio C Hamano
2019-11-23 9:54 ` Phillip Wood [this message]
2019-11-24 10:52 ` Phillip Wood
2019-11-25 3:00 ` Junio C Hamano
2019-11-25 14:23 ` Phillip Wood
2019-11-25 15:53 ` Johannes Schindelin
2019-11-25 16:10 ` Eric Sunshine
2019-11-25 22:52 ` Johannes Schindelin
2019-11-25 16:42 ` Phillip Wood
2019-11-26 1:11 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=340859a7-5cc4-f641-818d-fcedbf29a2a6@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.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).