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

Re: [PATCH 1/2] cherry-pick: demonstrate a segmentation fault

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Nov 26, 2016, 12:47 UTC
Message-ID
<alpine.DEB.2.20.1611261336240.117539@virtualbox>
In-Reply-To
<89ffd6eaf4e1e121426c84f31dfc9c289f2a948b.1480091758.git.johannes.schindelin@gmx.de>
Hi,
On Fri, 25 Nov 2016, Johannes Schindelin wrote:
> +test_expect_failure 'cherry-pick fails gracefully with dirty renamed file' '

Woops. This title is wrong. It should say instead: 'cherry-pick succeeds with unrelated renamed, dirty file'.

Show 9 quoted lines
> +	test_commit to-rename &&
> +	git checkout -b unrelated &&
> +	test_commit unrelated &&
> +	git checkout @{-1} &&
> +	git mv to-rename.t renamed &&
> +	test_tick &&
> +	git commit -m renamed &&
> +	echo modified >renamed &&
> +	git cherry-pick unrelated
And this actually warns about an ambiguous refname.
Will send out v2 in a moment.

Ciao, Dscho

Previous: Johannes SchindelinNext: Johannes Schindelin
Message 3 of 11 in “Fix segmentation fault with cherry-pick”
  1. 0/2 Fix segmentation fault with cherry-pickJohannes Schindelin, Nov 25, 2016
  2. 1/2 cherry-pick: demonstrate a segmentation faultJohannes Schindelin, Nov 25, 2016
  3. Johannes SchindelinNov 26, 2016
  4. 2/2 Avoid a segmentation fault with renaming mergesJohannes Schindelin, Nov 25, 2016
  5. Johannes SchindelinNov 25, 2016
  6. 0/2 Fix segmentation fault with cherry-pickJohannes Schindelin, Nov 26, 2016
  7. 1/2 cherry-pick: demonstrate a segmentation faultJohannes Schindelin, Nov 26, 2016
  8. 2/2 Avoid a segmentation fault with renaming mergesJohannes Schindelin, Nov 26, 2016
  9. Johannes SchindelinNov 26, 2016
  10. Junio C HamanoNov 28, 2016
  11. Junio C HamanoNov 28, 2016

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.