| Message ID | 48c79dc3d84f55dec4cd2199cc4152e146bee0ba.1608609498.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 18f9c9884582c743d8ba04ef5cbbe647947d2578 |
| Headers | show |
| Series | negative-refspec: fix segfault on : refspec | expand |
On Mon, Dec 21, 2020 at 8:01 PM Nipunn Koorapati via GitGitGadget <gitgitgadget@gmail.com> wrote: > > From: Nipunn Koorapati <nipunn@dropbox.com> > > The logic added to check for negative pathspec match by c0192df630 > (refspec: add support for negative refspecs, 2020-09-30) looks at > refspec->src assuming it is never NULL, however when > remote.origin.push is set to ":", then refspec->src is NULL, > causing a segfault within strcmp. > > Tell git to handle matching refspec by adding the needle to the > set of positively matched refspecs, since matching ":" refspecs > match anything as src. > This seems like the right approach to me. Thanks for the fix, and the tests so we don't break it on accident again in the future. belated, but.... Reviewed-by: Jacob Keller <jacob.keller@gmail.com> > Add test for matching refspec pushes fetch-negative-refspec > both individually and in combination with a negative refspec. > > Signed-off-by: Nipunn Koorapati <nipunn@dropbox.com> > --- > remote.c | 10 ++++-- > t/t5582-fetch-negative-refspec.sh | 51 +++++++++++++++++++++++++++++++ > 2 files changed, 58 insertions(+), 3 deletions(-) > > diff --git a/remote.c b/remote.c > index 8be67f0892b..4f1a4099f1a 100644 > --- a/remote.c > +++ b/remote.c > @@ -751,9 +751,13 @@ static int query_matches_negative_refspec(struct refspec *rs, struct refspec_ite > > if (match_name_with_pattern(key, needle, value, &expn_name)) > string_list_append_nodup(&reversed, expn_name); > - } else { > - if (!strcmp(needle, refspec->src)) > - string_list_append(&reversed, refspec->src); > + } else if (refspec->matching) { > + /* For the special matching refspec, any query should match */ > + string_list_append(&reversed, needle); Right, so we explicitly handle matching first... > + } else if (!refspec->src) { > + BUG("refspec->src should not be null here"); and then carefully check to make sure we don't end up with a NULL src for some other reason, and at least BUG() instead of just crashing. This shouldn't be possible because when we build the refspec, src is always not NULL unless in the case of matching. Ok. > + } else if (!strcmp(needle, refspec->src)) { > + string_list_append(&reversed, refspec->src); > } > } Yep, this looks like the best approach to solving this. > > diff --git a/t/t5582-fetch-negative-refspec.sh b/t/t5582-fetch-negative-refspec.sh > index 8c61e28fec8..2f3b064d0e7 100755 > --- a/t/t5582-fetch-negative-refspec.sh > +++ b/t/t5582-fetch-negative-refspec.sh > @@ -186,4 +186,55 @@ test_expect_success "fetch --prune with negative refspec" ' > ) > ' > > +test_expect_success "push with matching : and negative refspec" ' > + # Manually handle cleanup, since test_config is not > + # prepared to take arbitrary options like --add > + test_when_finished "test_unconfig -C two remote.one.push" && > + > + # For convenience, we use "master" to refer to the name of > + # the branch created by default in the following. > + # > + # Repositories two and one have branches other than "master" > + # but they have no overlap---"master" is the only one that > + # is shared between them. And the master branch at two is > + # behind the master branch at one by one commit. > + git -C two config --add remote.one.push : && > + > + # A matching push tries to update master, fails due to non-ff > + test_must_fail git -C two push one && > + > + # "master" may actually not be "master"---find it out. > + current=$(git symbolic-ref HEAD) && > + > + # If master is in negative refspec, then the command will not attempt > + # to push and succeed. > + git -C two config --add remote.one.push "^$current" && > + > + # With "master" excluded, this push is a no-op. Nothing gets > + # pushed and it succeeds. > + git -C two push -v one > +' > + > +test_expect_success "push with matching +: and negative refspec" ' > + test_when_finished "test_unconfig -C two remote.one.push" && > + > + # The same set-up as above, whose side-effect was a no-op. > + git -C two config --add remote.one.push +: && > + > + # The push refuses to update the "master" branch that is checked > + # out in the "one" repository, even when it is forced with +: > + test_must_fail git -C two push one && > + > + # "master" may actually not be "master"---find it out. > + current=$(git symbolic-ref HEAD) && > + > + # If master is in negative refspec, then the command will not attempt > + # to push and succeed > + git -C two config --add remote.one.push "^$current" && > + > + # With "master" excluded, this push is a no-op. Nothing gets > + # pushed and it succeeds. > + git -C two push -v one > +' > + > test_done > -- > gitgitgadget >
diff --git a/remote.c b/remote.c index 8be67f0892b..4f1a4099f1a 100644 --- a/remote.c +++ b/remote.c @@ -751,9 +751,13 @@ static int query_matches_negative_refspec(struct refspec *rs, struct refspec_ite if (match_name_with_pattern(key, needle, value, &expn_name)) string_list_append_nodup(&reversed, expn_name); - } else { - if (!strcmp(needle, refspec->src)) - string_list_append(&reversed, refspec->src); + } else if (refspec->matching) { + /* For the special matching refspec, any query should match */ + string_list_append(&reversed, needle); + } else if (!refspec->src) { + BUG("refspec->src should not be null here"); + } else if (!strcmp(needle, refspec->src)) { + string_list_append(&reversed, refspec->src); } } diff --git a/t/t5582-fetch-negative-refspec.sh b/t/t5582-fetch-negative-refspec.sh index 8c61e28fec8..2f3b064d0e7 100755 --- a/t/t5582-fetch-negative-refspec.sh +++ b/t/t5582-fetch-negative-refspec.sh @@ -186,4 +186,55 @@ test_expect_success "fetch --prune with negative refspec" ' ) ' +test_expect_success "push with matching : and negative refspec" ' + # Manually handle cleanup, since test_config is not + # prepared to take arbitrary options like --add + test_when_finished "test_unconfig -C two remote.one.push" && + + # For convenience, we use "master" to refer to the name of + # the branch created by default in the following. + # + # Repositories two and one have branches other than "master" + # but they have no overlap---"master" is the only one that + # is shared between them. And the master branch at two is + # behind the master branch at one by one commit. + git -C two config --add remote.one.push : && + + # A matching push tries to update master, fails due to non-ff + test_must_fail git -C two push one && + + # "master" may actually not be "master"---find it out. + current=$(git symbolic-ref HEAD) && + + # If master is in negative refspec, then the command will not attempt + # to push and succeed. + git -C two config --add remote.one.push "^$current" && + + # With "master" excluded, this push is a no-op. Nothing gets + # pushed and it succeeds. + git -C two push -v one +' + +test_expect_success "push with matching +: and negative refspec" ' + test_when_finished "test_unconfig -C two remote.one.push" && + + # The same set-up as above, whose side-effect was a no-op. + git -C two config --add remote.one.push +: && + + # The push refuses to update the "master" branch that is checked + # out in the "one" repository, even when it is forced with +: + test_must_fail git -C two push one && + + # "master" may actually not be "master"---find it out. + current=$(git symbolic-ref HEAD) && + + # If master is in negative refspec, then the command will not attempt + # to push and succeed + git -C two config --add remote.one.push "^$current" && + + # With "master" excluded, this push is a no-op. Nothing gets + # pushed and it succeeds. + git -C two push -v one +' + test_done