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

Re: [PATCH] mergetool: Suppress stderr and fix the "both added" test

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 21, 2012, 21:27 UTC
Message-ID
<7v39b8d9w6.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1327141578-54796-1-git-send-email-davvid@gmail.com>
David Aguilar <davvid@gmail.com> writes:
Show 12 quoted lines
> Silence error messages when "git checkout-index" is used to
> checkout a stage that does not exist.  This can happen now that
> mergetool calls checkout_staged_file() unconditionally when
> creating the temporary $BASE, $LOCAL, and $REMOTE files.
>
> Fix the test so that it checks the contents of the "both added"
> file.  The test was passing as a consequence of accidentally
> handing a bad path to "cat".
>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
> This applies on top of da/maint-mergetool-twoway in pu.
Thanks.

It might make sense to squash this into the previous patch, which luckily hasn't hit 'next' yet, though---which I can do locally without need for re-send if you like.

Previous: David AguilarNext: David Aguilar
Message 2 of 3 in “mergetool: Suppress stderr and fix the "both added" test”
  1. mergetool: Suppress stderr and fix the "both added" testDavid Aguilar, Jan 21, 2012
  2. Junio C HamanoJan 21, 2012
  3. David AguilarJan 21, 2012

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.