From: Nipunn Koorapati <nipunn@xxxxxxxxxxx>
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.
Add test for matching refspec pushes fetch-negative-refspec
both individually and in combination with a negative refspec.
Signed-off-by: Nipunn Koorapati <nipunn@xxxxxxxxxxx>
---
remote.c | 10 +++++++---
t/t5582-fetch-negative-refspec.sh | 24 ++++++++++++++++++++++++
2 files changed, 31 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);
+ } 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..a4960c586b1 100755
--- a/t/t5582-fetch-negative-refspec.sh
+++ b/t/t5582-fetch-negative-refspec.sh
@@ -186,4 +186,28 @@ test_expect_success "fetch --prune with negative refspec" '
)
'
+test_expect_success "push with matching : and negative refspec" '
+ test_config -C two remote.one.push : &&
+ # Fails to push master w/ tip behind counterpart
+ test_must_fail git -C two push one &&
+
+ # If master is in negative refspec, then the command will not attempt
+ # to push and succeed.
+ # We do not need test_config here as we are updating remote.one.push
+ # again. The teardown of the first test_config will do --unset-all
+ git -C two config --add remote.one.push ^refs/heads/master &&
+ git -C two push one
+'
+
+test_expect_success "push with matching +: and negative refspec" '
+ test_config -C two remote.one.push +: &&
+ # Fails to push master w/ tip behind counterpart
+ test_must_fail git -C two push one &&
+
+ # If master is in negative refspec, then the command will not attempt
+ # to push and succeed
+ git -C two config --add remote.one.push ^refs/heads/master &&
+ git -C two push one
+'
+
test_done
--
gitgitgadget
