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

Re: [PATCH 1/3] Tighten and correct a few testcases for merging and cherry-picking

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 5, 2018, 21:24 UTC
Message-ID
<nycvar.QRO.7.76.6.1801052223130.1337@wbunaarf-fpuvaqryva.tvgsbejvaqbjf.bet>
In-Reply-To
<20180105202001.24218-2-newren@gmail.com>
Hi Elijah,
On Fri, 5 Jan 2018, Elijah Newren wrote:
Show 8 quoted lines
> t3501 had a testcase originally added in 05f2dfb965 (cherry-pick:
> demonstrate a segmentation fault, 2016-11-26) to ensure cherry-pick
> wouldn't segfault when working with a dirty file involved in a rename.
>
> While the segfault was fixed, there was another problem this test
> demonstrated: namely, that git would overwrite a dirty file involved in a
> rename.  Further, the test encoded a "successful merge" and overwriting of
> this file as correct behavior.

Whoops. Sorry about that. Thanks for the patch, looks obviously good (I haven't read 3/3 yet, but figure that the error message stems from the changes introduced in that patch).

Ciao, Dscho

Previous: Elijah NewrenNext: Elijah Newren
Message 3 of 7 in “Some small fixes to merge-recursive and tests”
  1. 0/3 Some small fixes to merge-recursive and testsElijah Newren, Jan 5, 2018
  2. 1/3 Tighten and correct a few testcases for merging and cherry-pickingElijah Newren, Jan 5, 2018
  3. Johannes SchindelinJan 5, 2018
  4. 2/3 merge-recursive: fix logic ordering issueElijah Newren, Jan 5, 2018
  5. Johannes SchindelinJan 5, 2018
  6. 3/3 merge-recursive: add explanation for src_entry and dst_entryElijah Newren, Jan 5, 2018
  7. Johannes SchindelinJan 5, 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.