From: Todd Zullinger <tmz@pobox.com>
To: phillip.wood@dunelm.org.uk
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH 1/2] rebase --root: demonstrate a bug while amending rootcommit messages
Date: Mon, 18 Jun 2018 12:49:58 -0400 [thread overview]
Message-ID: <20180618164958.GO11827@zaya.teonanacatl.net> (raw)
In-Reply-To: <484fe825-0726-a027-1187-de00df6406d5@talktalk.net>
Hi Phillip,
Phillip Wood wrote:
> On 15/06/18 05:31, Johannes Schindelin via GitGitGadget wrote:
>>
>> From: Todd Zullinger <tmz@pobox.com>
>>
>> +test_expect_failure 'rebase -i --root reword root commit' '
>> + test_when_finished "test_might_fail git rebase --abort" &&
>> + git checkout -b reword-root-branch master &&
>> + set_fake_editor &&
>> + FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
>> + git rebase -i --root &&
>> + git show HEAD^ | grep "A changed"
>
> I wonder if it should also check that HEAD^ is the root commit, to make
> sure that the squash-onto commit that's created and then amended has
> been squashed onto.
Hmm, is that something which other tests don't cover or an
issue that could affect 'rebase -i --root' with reword
differently than other 'rebase -i' commands?
I admit I'm not well-versed in the rebase -i tests and I
focused only on creating a test which demonstrated the bug I
noticed.
--
Todd
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The average woman would rather be beautiful than smart because the
average man can see better than he can think.
next prev parent reply other threads:[~2018-06-18 16:50 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-16 19:26 [PATCH 0/2] rebase --root: fix `reword` on a root commit Johannes Schindelin via GitGitGadget
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 [this message]
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=20180618164958.GO11827@zaya.teonanacatl.net \
--to=tmz@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--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).