From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Elijah Newren <newren@gmail.com>
Cc: gitster@pobox.com, git@vger.kernel.org, sbeller@google.com
Subject: Re: [PATCH 1/3] Tighten and correct a few testcases for merging and cherry-picking
Date: Fri, 5 Jan 2018 22:24:21 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1801052223130.1337@wbunaarf-fpuvaqryva.tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20180105202001.24218-2-newren@gmail.com>
Hi Elijah,
On Fri, 5 Jan 2018, Elijah Newren wrote:
> 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
next prev parent reply other threads:[~2018-01-05 21:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-05 20:19 [PATCH 0/3] Some small fixes to merge-recursive and tests Elijah Newren
2018-01-05 20:19 ` [PATCH 1/3] Tighten and correct a few testcases for merging and cherry-picking Elijah Newren
2018-01-05 21:24 ` Johannes Schindelin [this message]
2018-01-05 20:20 ` [PATCH 2/3] merge-recursive: fix logic ordering issue Elijah Newren
2018-01-05 21:22 ` Johannes Schindelin
2018-01-05 20:20 ` [PATCH 3/3] merge-recursive: add explanation for src_entry and dst_entry Elijah Newren
2018-01-05 21:26 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1801052223130.1337@wbunaarf-fpuvaqryva.tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).