All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: GitGitGadget <gitgitgadget@gmail.com>
Subject: [PATCH 0/2] rebase --root: fix `reword` on a root commit
Date: Sat, 16 Jun 2018 19:26:16 +0000	[thread overview]
Message-ID: <pull.3.git.gitgitgadget@gmail.com> (raw)

From: GitGitGadget <gitgitgadget@gmail.com>

Todd Zullinger reported this bug in https://public-inbox.org/git/20180615043111.GS3094@zaya.teonanacatl.net/: when calling git rebase --root and trying to reword the root commit's message, a BUG is reported.

This fixes that.

IMO the bug fix is trivial enough to qualify for inclusion into v2.18.0, still.

Johannes Schindelin (1):
  rebase --root: fix amending root commit messages

Todd Zullinger (1):
  rebase --root: demonstrate a bug while amending root commit messages

 sequencer.c                   | 2 +-
 t/t3404-rebase-interactive.sh | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)


base-commit: 68372c88794aba15f853542008cda39def768372
-- 
2.17.0.windows.1

             reply	other threads:[~2018-06-16 19:26 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-16 19:26 Johannes Schindelin via GitGitGadget [this message]
2018-06-15  4:31 ` [PATCH 1/2] rebase --root: demonstrate a bug while amending root commit messages Johannes Schindelin via GitGitGadget
2018-06-18 10:25   ` [PATCH 1/2] rebase --root: demonstrate a bug while amending rootcommit messages Phillip Wood
2018-06-18 16:49     ` Todd Zullinger
2018-06-18 21:46       ` Johannes Schindelin
2018-06-18 22:19         ` [PATCH] t3404: check root commit in 'rebase -i --root reword root commit' Todd Zullinger
2018-06-19  6:54           ` Johannes Schindelin
2018-06-19 16:00           ` Junio C Hamano
2018-06-19 19:12             ` Todd Zullinger
2018-06-20 11:03             ` Johannes Schindelin
2018-06-19 16:21           ` Junio C Hamano
2018-06-20 11:04             ` Johannes Schindelin
2018-06-16 19:00 ` [PATCH 2/2] rebase --root: fix amending root commit messages Johannes Schindelin via GitGitGadget
2018-06-16 20:11 ` [PATCH 0/2] rebase --root: fix `reword` on a root commit Todd Zullinger
2018-06-18 16:21   ` Junio C Hamano
2018-06-18 16:41     ` Todd Zullinger
2018-06-18 19:25       ` 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.3.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    /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.