Skip to content

Commit 2514334

Browse files
committed
Merge branch 'fix-571'
2 parents f53f942 + ef7467c commit 2514334

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

git-refspec/src/match_group/util.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ impl<'a> Needle<'a> {
104104
return Match::None;
105105
}
106106
let end = item.full_ref_name.len() - tail.len();
107-
let end = item.full_ref_name[*asterisk_pos..end].find_byte(b'/').unwrap_or(end);
108107
Match::GlobRange(*asterisk_pos..end)
109108
}
110109
Needle::Object(id) => {

git-refspec/tests/fixtures/match_baseline.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ mkdir base
2929
git checkout -b f3 main
3030
git commit -m "f3" --allow-empty
3131
git tag v0.0-f3
32+
33+
git checkout -b sub/f4 main
34+
git checkout -b sub/subdir/f5 main
35+
git checkout -b suub/f6 main
3236
)
3337

3438
git clone --shared ./base clone
@@ -51,6 +55,7 @@ git clone --shared ./base clone
5155
baseline "+refs/heads/*:refs/remotes/origin/*"
5256
baseline "refs/heads/*1:refs/remotes/origin/*1"
5357
baseline "refs/heads/f*:refs/remotes/origin/a*"
58+
baseline "refs/heads/*/f6:refs/remotes/origin/*/f6"
5459
baseline "main" "f1"
5560
baseline "heads/main" "heads/f1"
5661
baseline "refs/heads/main" "refs/heads/f1"

git-refspec/tests/matching/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ pub mod baseline {
290290
}
291291

292292
fn full_remote_ref(mut name: BString) -> BString {
293-
if !name.contains(&b'/') {
293+
if !name.contains(&b'/') || name.starts_with(b"sub/") || name.starts_with(b"suub/") {
294294
if looks_like_tag(&name) {
295295
name.insert_str(0, b"refs/tags/");
296296
} else if let Ok(_id) = git_hash::ObjectId::from_hex(name.as_ref()) {

0 commit comments

Comments
 (0)