[PATCH v2 0/1] sequencer: fix empty commit check when amending
- From
- Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Nov 22, 2019, 19:43 UTC
- Message-ID
- <pull.467.v2.git.1574451783.gitgitgadget@gmail.com>
- 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