diff options
| author | Elijah Newren <newren@gmail.com> | 2019-08-15 14:40:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-16 12:47:20 -0700 |
| commit | d8523ca1b90641be4bddcdfc50fbf3a1be34adae (patch) | |
| tree | 1ceb825bf17d97e42d2638c60a4fefc6e963d4ce /commit.c | |
| parent | Git 2.23 (diff) | |
| download | git-d8523ca1b90641be4bddcdfc50fbf3a1be34adae.tar.gz git-d8523ca1b90641be4bddcdfc50fbf3a1be34adae.zip | |
merge-recursive: be consistent with assert
In commit 8daec1df03de ("merge-recursive: switch from (oid,mode) pairs
to a diff_filespec", 2019-04-05), an assertion on a->path && b->path
was added for code readability to document that these both needed to be
non-NULL at this point in the code. However, the subsequent lines also
read o->path, so it should be included in the assert.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions