kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'en/object-name-with-funny-refname-fix' 

Extended SHA-1 expression parser did not work well when a branch
with an unusual name (e.g. "foo{bar") is involved.

* en/object-name-with-funny-refname-fix:
  object-name: be more strict in parsing describe-like output
  object-name: fix resolution of object names containing curly braces
maint
Junio C Hamano 2025-01-23 15:07:01 -08:00
parent 4e746b1a31 191f0c8db2
commit 7e3cb2e515
3 changed files with 113 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
object-name.c
View File

@ -1272,6 +1272,58 @@ static int peel_onion(struct repository *r, const char *name, int len,
return 0;
}

/*
* Documentation/revisions.txt says:
* '<describeOutput>', e.g. 'v1.7.4.2-679-g3bee7fb'::
* Output from `git describe`; i.e. a closest tag, optionally
* followed by a dash and a number of commits, followed by a dash, a
* 'g', and an abbreviated object name.
*
* which means that the stuff before '-g${HASH}' needs to be a valid
* refname, a dash, and a non-negative integer. This function verifies
* that.
*
* In particular, we do not want to treat
* branchname:path/to/file/named/i-gaffed
* as a request for commit affed.
*
* More generally, we should probably not treat
* 'refs/heads/./../.../ ~^:/?*[////\\\&}/busted.lock-g050e0ef6ead'
* as a request for object 050e0ef6ead either.
*
* We are called with name[len] == '-' and name[len+1] == 'g', i.e.
* we are verifying ${REFNAME}-{INTEGER} part of the name.
*/
static int ref_and_count_parts_valid(const char *name, int len)
{
struct strbuf sb;
const char *cp;
int flags = REFNAME_ALLOW_ONELEVEL;
int ret = 1;

/* Ensure we have at least one digit */
if (!isxdigit(name[len-1]))
return 0;

/* Skip over digits backwards until we get to the dash */
for (cp = name + len - 2; name < cp; cp--) {
if (*cp == '-')
break;
if (!isxdigit(*cp))
return 0;
}
/* Ensure we found the leading dash */
if (*cp != '-')
return 0;

len = cp - name;
strbuf_init(&sb, len);
strbuf_add(&sb, name, len);
ret = !check_refname_format(sb.buf, flags);
strbuf_release(&sb);
return ret;
}

static int get_describe_name(struct repository *r,
const char *name, int len,
struct object_id *oid)
@ -1285,7 +1337,8 @@ static int get_describe_name(struct repository *r,
/* We must be looking at g in "SOMETHING-g"
* for it to be describe output.
*/
if (ch == 'g' && cp[-1] == '-') {
if (ch == 'g' && cp[-1] == '-' &&
ref_and_count_parts_valid(name, cp - 1 - name)) {
cp++;
len -= cp - name;
return get_short_oid(r,
@ -2052,12 +2105,14 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
return -1;
}
for (cp = name, bracket_depth = 0; *cp; cp++) {
if (*cp == '{')
if (strchr("@^", *cp) && cp[1] == '{') {
cp++;
bracket_depth++;
else if (bracket_depth && *cp == '}')
} else if (bracket_depth && *cp == '}') {
bracket_depth--;
else if (!bracket_depth && *cp == ':')
} else if (!bracket_depth && *cp == ':') {
break;
}
}
if (*cp == ':') {
struct object_id tree_oid;

31
t/t1006-cat-file.sh
View File

@ -240,7 +240,8 @@ test_expect_success "setup" '
git config extensions.objectformat $test_hash_algo &&
git config extensions.compatobjectformat $test_compat_hash_algo &&
echo_without_newline "$hello_content" > hello &&
git update-index --add hello
git update-index --add hello &&
git commit -m "add hello file"
'

run_blob_tests () {
@ -602,6 +603,34 @@ test_expect_success FUNNYNAMES '--batch-check, -Z with newline in input' '
test_cmp expect actual
'

test_expect_success 'setup with curly braches in input' '
git branch "foo{bar" HEAD &&
git branch "foo@" HEAD
'

test_expect_success 'object reference with curly brace' '
git cat-file -p "foo{bar:hello" >actual &&
git cat-file -p HEAD:hello >expect &&
test_cmp expect actual
'

test_expect_success 'object reference with at-sign' '
git cat-file -p "foo@@{0}:hello" >actual &&
git cat-file -p HEAD:hello >expect &&
test_cmp expect actual
'

test_expect_success 'setup with commit with colon' '
git commit-tree -m "testing: just a bunch of junk" HEAD^{tree} >out &&
git branch other $(cat out)
'

test_expect_success 'object reference via commit text search' '
git cat-file -p "other^{/testing:}:hello" >actual &&
git cat-file -p HEAD:hello >expect &&
test_cmp expect actual
'

test_expect_success 'setup blobs which are likely to delta' '
test-tool genrandom foo 10240 >foo &&
{ cat foo && echo plus; } >foo-plus &&

24
t/t6120-describe.sh
View File

@ -82,11 +82,13 @@ check_describe R-2-gHASH HEAD^^
check_describe A-3-gHASH HEAD^^2
check_describe B HEAD^^2^
check_describe R-1-gHASH HEAD^^^
check_describe R-1-gHASH R-1-g$(git rev-parse --short HEAD^^)~1

check_describe c-7-gHASH --tags HEAD
check_describe c-6-gHASH --tags HEAD^
check_describe e-1-gHASH --tags HEAD^^
check_describe c-2-gHASH --tags HEAD^^2
check_describe c-2-gHASH --tags c-2-g$(git rev-parse --short HEAD^^2)^0
check_describe B --tags HEAD^^2^
check_describe e --tags HEAD^^^
check_describe e --tags --exact-match HEAD^^^
@ -725,4 +727,26 @@ test_expect_success '--exact-match does not show --always fallback' '
test_must_fail git describe --exact-match --always
'

test_expect_success 'avoid being fooled by describe-like filename' '
test_when_finished rm out &&

git rev-parse --short HEAD >out &&
FILENAME=filename-g$(cat out) &&
touch $FILENAME &&
git add $FILENAME &&
git commit -m "Add $FILENAME" &&

git cat-file -t HEAD:$FILENAME >actual &&

echo blob >expect &&
test_cmp expect actual
'

test_expect_success 'do not be fooled by invalid describe format ' '
test_when_finished rm out &&

git rev-parse --short HEAD >out &&
test_must_fail git cat-file -t "refs/tags/super-invalid/./../...../ ~^:/?*[////\\\\\\&}/busted.lock-42-g"$(cat out)
'

test_done