summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-23 21:57:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-23 21:57:53 (GMT)
commitc7604715f844a4740cf2383bfa6af2cb35827d18 (patch)
tree32ce276f9e20585c598c6ef2b81b92d01f263956
parent545456c0140e172013fc33a72f6e3a1aa01c349d (diff)
parente0e1dbe961b45997718e9bc0a384a5a3df527a2f (diff)
downloadgit-c7604715f844a4740cf2383bfa6af2cb35827d18.zip
git-c7604715f844a4740cf2383bfa6af2cb35827d18.tar.gz
git-c7604715f844a4740cf2383bfa6af2cb35827d18.tar.bz2
Merge branch 'ah/connect-parse-feature-v0-fix' into jch
* ah/connect-parse-feature-v0-fix: connect: also update offset for features without values
-rw-r--r--connect.c2
-rwxr-xr-xt/t5704-protocol-violations.sh13
2 files changed, 15 insertions, 0 deletions
diff --git a/connect.c b/connect.c
index aff13a2..eaf7d6d 100644
--- a/connect.c
+++ b/connect.c
@@ -557,6 +557,8 @@ const char *parse_feature_value(const char *feature_list, const char *feature, i
if (!*value || isspace(*value)) {
if (lenp)
*lenp = 0;
+ if (offset)
+ *offset = found + len - feature_list;
return value;
}
/* feature with a value (e.g., "agent=git/1.2.3") */
diff --git a/t/t5704-protocol-violations.sh b/t/t5704-protocol-violations.sh
index 5c94194..0983c2b 100755
--- a/t/t5704-protocol-violations.sh
+++ b/t/t5704-protocol-violations.sh
@@ -32,4 +32,17 @@ test_expect_success 'extra delim packet in v2 fetch args' '
test_i18ngrep "expected flush after fetch arguments" err
'
+test_expect_success 'bogus symref in v0 capabilities' '
+ test_commit foo &&
+ oid=$(git rev-parse HEAD) &&
+ {
+ printf "%s HEAD\0symref object-format=%s\n" "$oid" "$GIT_DEFAULT_HASH" |
+ test-tool pkt-line pack-raw-stdin &&
+ printf "0000"
+ } >input &&
+ git ls-remote --upload-pack="cat input; read junk;:" . >actual &&
+ printf "%s\tHEAD\n" "$oid" >expect &&
+ test_cmp expect actual
+'
+
test_done