git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/2] rebase --root: demonstrate a bug while amending rootcommit messages

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 18, 2018, 21:46 UTC
Message-ID
<nycvar.QRO.7.76.6.1806182343421.77@tvgsbejvaqbjf.bet>
In-Reply-To
<20180618164958.GO11827@zaya.teonanacatl.net>
Hi Todd,
On Mon, 18 Jun 2018, Todd Zullinger wrote:
Show 24 quoted lines
> 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.

I think we should test this here, to make sure it is tested, and it should be as easy as:

	test -z "$(git show -s --format=%p HEAD^)"

Hopefully you beat me to it, otherwise I will try to take care of this tomorrow.

Ciao, Dscho

Previous: Todd ZullingerNext: Todd Zullinger
Message 5 of 17 in “rebase --root: fix `reword` on a root commit”
  1. 0/2 rebase --root: fix `reword` on a root commitJohannes Schindelin via GitGitGadget, Jun 16, 2018
  2. 1/2 rebase --root: demonstrate a bug while amending root commit messagesJohannes Schindelin via GitGitGadget, Jun 15, 2018
  3. Phillip WoodJun 18, 2018
  4. Todd ZullingerJun 18, 2018
  5. Johannes SchindelinJun 18, 2018
  6. t3404: check root commit in 'rebase -i --root reword root commit'Todd Zullinger, Jun 18, 2018
  7. Johannes SchindelinJun 19, 2018
  8. Junio C HamanoJun 19, 2018
  9. Todd ZullingerJun 19, 2018
  10. Johannes SchindelinJun 20, 2018
  11. Junio C HamanoJun 19, 2018
  12. Johannes SchindelinJun 20, 2018
  13. 2/2 rebase --root: fix amending root commit messagesJohannes Schindelin via GitGitGadget, Jun 16, 2018
  14. Todd ZullingerJun 16, 2018
  15. Junio C HamanoJun 18, 2018
  16. Todd ZullingerJun 18, 2018
  17. Junio C HamanoJun 18, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.