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

Re: [PATCH 1/2] merge-file fails to output anything for a degenerate merge

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
May 25, 2009, 07:52 UTC
Message-ID
<alpine.DEB.1.00.0905250951120.26154@pacific.mpi-cbg.de>
In-Reply-To
<1243210874-18451-2-git-send-email-charles@hashpling.org>
Hi,
On Mon, 25 May 2009, Charles Bailey wrote:
Show 8 quoted lines
> In the case that merge-file is passed three files with identical
> contents it wipes the contents of the output file instead of
> leaving it unchanged.
> 
> Althought merge-file is porcelain and this will never happen in
> normal usage, it is still wrong.
> 
> Signed-off-by: Charles Bailey <charles@hashpling.org>

Your patch is good, but I'd like to have it mention in the commit subject that this is not a fix, but a patch to the test suite. A prefix "t6023:" would suffice, methinks.

Thanks, Dscho

Previous: Johannes Schindelin
Message 5 of 5 in “Slightly obscure merge-file inconsistency”
  1. Charles BaileyMay 25, 2009
  2. 1/2 merge-file fails to output anything for a degenerate mergeCharles Bailey, May 25, 2009
  3. 2/2 Change xdl_merge to generate output even for null mergesCharles Bailey, May 25, 2009
  4. Johannes SchindelinMay 25, 2009
  5. Johannes SchindelinMay 25, 2009

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.