From: Junio C Hamano <gitster@pobox.com>
To: Jinoh Kang <luke1337@theori.io>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v4] diff: make diff_free_filespec_data accept NULL
Date: Tue, 10 Nov 2020 11:41:59 -0800 [thread overview]
Message-ID: <xmqqpn4l6ltk.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <137f0fc1-fbd9-a62c-bd52-cffd26c364bf@theori.io> (Jinoh Kang's message of "Tue, 10 Nov 2020 14:06:56 +0000")
Jinoh Kang <luke1337@theori.io> writes:
> Today, diff_free_filespec_data crashes when passed a NULL pointer.
No need to say "Today". We state how things are in the current
codebase in the present tense, make observations on the way things
can break (i.e. identify a bug), and outline an approach to correct
it.
> Commit 3aef54e8b8 ("diff: munmap() file contents before running external
> diff") introduced calls to diff_free_filespec_data in run_external_diff,
> which may pass NULL pointers.
>
> Git uses NULL filespecs to indicate unmerged files when merge conflict
> resolution is in progress. Fortunately, other code paths bail out early
> even before NULL can reach diff_free_filespec_data(); however, difftool
> is expected to do a full-blown diff anyway regardless of conflict
> status.
>
> Fix this and prevent any similar bugs in the future by making
> `diff_free_filespec_data(NULL)` a no-op.
Nicely described.
> Also, add a test case that confirms that running difftool --cached with
> unmerged files does not SIGSEGV.
> +test_expect_success 'difftool --cached with unmerged files' '
> + test_when_finished git reset --hard &&
> + echo base >file &&
> + git add file &&
> + git commit -m base &&
> + git checkout -B conflict-a &&
> + git checkout -B conflict-b &&
The above two are not wrong per-se, but would conceptually be
cleaner to use "git branch -f", because the next thing you do
immediately after preparing two branches is to start working on the
'A' side, below.
You could alternatively drop the above two lines and then instead
turn this
> + git checkout conflict-a &&
into "git checkout -B conflict-a master" (and similarly on the 'B'
side below), which would reduce the test by two lines. That would
be what I would recommend to do under normal circumstances, but
since there is a separate topic that wages war on the 'master'
branch, I wouldn't recommend it.
> + echo conflict-a >>file &&
> + git add file &&
> + git commit -m conflict-a &&
> + git checkout conflict-b &&
> + echo conflict-b >>file &&
> + git add file &&
> + git commit -m conflict-b &&
> + git checkout master &&
> + git merge conflict-a &&
> + test_must_fail git merge conflict-b &&
> + : >expect &&
> + git difftool --cached --no-prompt >actual &&
> + test_cmp expect actual
Shouldn't we omit 'expect' and use test_must_be_empty helper
instead?
git difftool --cached --no-prompt >actual &&
test_must_be_empty actual
> +'
> +
> test_expect_success 'outside worktree' '
> echo 1 >1 &&
> echo 2 >2 &&
next prev parent reply other threads:[~2020-11-10 19:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <aeb24944-17af-cf53-93f4-e727f9fe9988@theori.io>
[not found] ` <xmqq4km4lppy.fsf@gitster.c.googlers.com>
2020-11-06 17:02 ` [PATCH v2] diff: handle NULL filespecs in run_external_diff Jinoh Kang
2020-11-06 17:14 ` [PATCH v3] diff: make diff_free_filespec_data accept NULL Jinoh Kang
2020-11-10 12:08 ` Johannes Schindelin
2020-11-10 13:16 ` Jinoh Kang
2020-11-10 14:21 ` Jinoh Kang
2020-11-10 17:02 ` Junio C Hamano
2020-11-10 14:06 ` [PATCH v4] " Jinoh Kang
2020-11-10 15:38 ` Johannes Schindelin
2020-11-11 12:30 ` Jinoh Kang
2020-11-11 16:28 ` Johannes Schindelin
2020-11-10 19:41 ` Junio C Hamano [this message]
2020-11-11 12:15 ` [PATCH v5] " Jinoh Kang
2020-11-11 16:27 ` Johannes Schindelin
2020-11-11 19:18 ` Junio C Hamano
2020-11-06 19:18 ` [PATCH v2] diff: handle NULL filespecs in run_external_diff Junio C Hamano
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=xmqqpn4l6ltk.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=luke1337@theori.io \
/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).