We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 6e9fb04 commit cb71a9cCopy full SHA for cb71a9c
src/merge.c
@@ -3191,7 +3191,7 @@ int git_merge_analysis_for_ref(
3191
int error = 0;
3192
bool unborn;
3193
3194
- assert(analysis_out && preference_out && repo && their_heads);
+ assert(analysis_out && preference_out && repo && their_heads && their_heads_len > 0);
3195
3196
if (their_heads_len != 1) {
3197
giterr_set(GITERR_MERGE, "can only merge a single branch");
@@ -3273,7 +3273,7 @@ int git_merge(
3273
unsigned int checkout_strategy;
3274
3275
3276
- assert(repo && their_heads);
+ assert(repo && their_heads && their_heads_len > 0);
3277
3278
3279
0 commit comments