[PATCH v4 01/24] merge-recursive: be consistent with assert
- From
Elijah Newren <newren@gmail.com>
- Date
- Aug 17, 2019, 18:41 UTC
- Message-ID
- <20190817184144.32179-2-newren@gmail.com>
- In-Reply-To
- <20190817184144.32179-1-newren@gmail.com>
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> --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/merge-recursive.c b/merge-recursive.c index 6b812d67e3..1d960fa64b 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1043,7 +1043,7 @@ static int merge_3way(struct merge_options *opt, } } - assert(a->path && b->path); + assert(a->path && b->path && o->path); if (strcmp(a->path, b->path) || (opt->ancestor != NULL && strcmp(a->path, o->path) != 0)) { base_name = opt->ancestor == NULL ? NULL :
-- 2.23.0.rc2.28.g5f89f15d7b.dirty