git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/1] sequencer: fix empty commit check when amending
Date: Fri, 22 Nov 2019 19:43:02 +0000	[thread overview]
Message-ID: <pull.467.v2.git.1574451783.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.467.git.1574345181.gitgitgadget@gmail.com>

Thanks for the comments, I've updated the patch with the style change Junio
suggested

I noticed this while adding some tests for a re-roll of
js/advise-rebase-skip

This patch is based on pw/post-commit-from-sequencer

Phillip Wood (1):
  sequencer: fix empty commit check when amending

 sequencer.c            | 26 +++++++++++++++++++++-----
 t/t3403-rebase-skip.sh | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 5 deletions(-)


base-commit: 4627bc777e9ade5e3a85d6b8e8630fc4b6e2f8f6
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-467%2Fphillipwood%2Fwip%2Frebase-fix-empty-commit-check-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-467/phillipwood/wip/rebase-fix-empty-commit-check-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/467

Range-diff vs v1:

 1:  7d34c0ff80 ! 1:  037f2b2975 sequencer: fix empty commit check when amending
     @@ -42,8 +42,10 @@
      +				first_parent = NULL;
      +			}
      +		}
     -+		if (oideq(first_parent ? get_commit_tree_oid(first_parent) :
     -+					 the_hash_algo->empty_tree, &tree)) {
     ++		if (oideq(first_parent
     ++			  ? get_commit_tree_oid(first_parent)
     ++			  : the_hash_algo->empty_tree,
     ++			  &tree)) {
      +			res = 1; /* run 'git commit' to display error message */
      +			goto out;
      +		}

-- 
gitgitgadget

  parent reply	other threads:[~2019-11-22 19:43 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 ` Phillip Wood via GitGitGadget [this message]
2019-11-22 19:43   ` [PATCH v2 " 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
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

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

  git send-email \
    --in-reply-to=pull.467.v2.git.1574451783.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    /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).