Skip to content

Commit 4581880

Browse files
committed
Add bindings for git_reference_name_is_valid, git_remote_name_is_valid & git_tag_name_is_valid
1 parent 49879e9 commit 4581880

File tree

5 files changed

+98
-2
lines changed

5 files changed

+98
-2
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
target
22
Cargo.lock
33
src/main.rs
4+
.idea

libgit2-sys/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -2247,6 +2247,7 @@ extern "C" {
22472247
) -> c_int;
22482248
pub fn git_remote_get_refspec(remote: *const git_remote, n: size_t) -> *const git_refspec;
22492249
pub fn git_remote_is_valid_name(remote_name: *const c_char) -> c_int;
2250+
pub fn git_remote_name_is_valid(valid: *mut c_int, remote_name: *const c_char) -> c_int;
22502251
pub fn git_remote_list(out: *mut git_strarray, repo: *mut git_repository) -> c_int;
22512252
pub fn git_remote_rename(
22522253
problems: *mut git_strarray,
@@ -2398,6 +2399,7 @@ extern "C" {
23982399
pub fn git_reference_is_remote(r: *const git_reference) -> c_int;
23992400
pub fn git_reference_is_tag(r: *const git_reference) -> c_int;
24002401
pub fn git_reference_is_valid_name(name: *const c_char) -> c_int;
2402+
pub fn git_reference_name_is_valid(valid: *mut c_int, refname: *const c_char) -> c_int;
24012403
pub fn git_reference_lookup(
24022404
out: *mut *mut git_reference,
24032405
repo: *mut git_repository,
@@ -3209,6 +3211,7 @@ extern "C" {
32093211
pub fn git_tag_target(target_out: *mut *mut git_object, tag: *const git_tag) -> c_int;
32103212
pub fn git_tag_target_id(tag: *const git_tag) -> *const git_oid;
32113213
pub fn git_tag_target_type(tag: *const git_tag) -> git_object_t;
3214+
pub fn git_tag_name_is_valid(valid: *mut c_int, tag_name: *const c_char) -> c_int;
32123215

32133216
// checkout
32143217
pub fn git_checkout_head(repo: *mut git_repository, opts: *const git_checkout_options)

src/reference.rs

+33-2
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,20 @@ impl<'repo> Reference<'repo> {
6565
unsafe { raw::git_reference_is_valid_name(refname.as_ptr()) == 1 }
6666
}
6767

68+
/// Ensure the reference name is well-formed.
69+
pub fn name_is_valid(refname: &str) -> Result<bool, Error> {
70+
crate::init();
71+
let refname = CString::new(refname)?;
72+
let mut valid: libc::c_int = 0;
73+
unsafe {
74+
try_call!(raw::git_reference_name_is_valid(
75+
&mut valid,
76+
refname.as_ptr()
77+
));
78+
}
79+
Ok(valid == 1)
80+
}
81+
6882
/// Normalize reference name and check validity.
6983
///
7084
/// This will normalize the reference name by collapsing runs of adjacent
@@ -463,13 +477,30 @@ mod tests {
463477
use crate::{ObjectType, Reference, ReferenceType};
464478

465479
#[test]
466-
fn smoke() {
480+
fn is_valid_name() {
467481
assert!(Reference::is_valid_name("refs/foo"));
468482
assert!(!Reference::is_valid_name("foo"));
469483
}
470484

471485
#[test]
472-
fn smoke2() {
486+
fn name_is_valid() {
487+
assert_eq!(Reference::name_is_valid("refs/foo").unwrap(), true);
488+
assert_eq!(Reference::name_is_valid("FOO_BAR").unwrap(), true);
489+
490+
assert_eq!(Reference::name_is_valid("foo").unwrap(), false);
491+
assert_eq!(Reference::name_is_valid("_FOO_BAR").unwrap(), false);
492+
493+
assert_eq!(
494+
Reference::name_is_valid("ab\012")
495+
.err()
496+
.unwrap()
497+
.to_string(),
498+
"data contained a nul byte that could not be represented as a string"
499+
);
500+
}
501+
502+
#[test]
503+
fn smoke() {
473504
let (_td, repo) = crate::test::repo_init();
474505
let mut head = repo.head().unwrap();
475506
assert!(head.is_branch());

src/remote.rs

+24
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,20 @@ impl<'repo> Remote<'repo> {
9595
unsafe { raw::git_remote_is_valid_name(remote_name.as_ptr()) == 1 }
9696
}
9797

98+
/// Ensure the remote name is well-formed.
99+
pub fn name_is_valid(remote_name: &str) -> Result<bool, Error> {
100+
crate::init();
101+
let remote_name = CString::new(remote_name)?;
102+
let mut valid: libc::c_int = 0;
103+
unsafe {
104+
try_call!(raw::git_remote_name_is_valid(
105+
&mut valid,
106+
remote_name.as_ptr()
107+
));
108+
}
109+
Ok(valid == 1)
110+
}
111+
98112
/// Create a detached remote
99113
///
100114
/// Create a remote with the given url in-memory. You can use this
@@ -856,6 +870,16 @@ mod tests {
856870
assert!(!Remote::is_valid_name("\x01"));
857871
}
858872

873+
#[test]
874+
fn name_is_valid() {
875+
assert_eq!(Remote::name_is_valid("foobar").unwrap(), true);
876+
assert_eq!(Remote::name_is_valid("\x01").unwrap(), false);
877+
assert_eq!(
878+
Remote::name_is_valid("ab\012").err().unwrap().to_string(),
879+
"data contained a nul byte that could not be represented as a string"
880+
);
881+
}
882+
859883
#[test]
860884
fn transfer_cb() {
861885
let (td, _repo) = crate::test::repo_init();

src/tag.rs

+37
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
use std::ffi::CString;
12
use std::marker;
23
use std::mem;
34
use std::ptr;
@@ -15,6 +16,19 @@ pub struct Tag<'repo> {
1516
}
1617

1718
impl<'repo> Tag<'repo> {
19+
/// Determine whether a tag name is valid, meaning that (when prefixed with refs/tags/) that
20+
/// it is a valid reference name, and that any additional tag name restrictions are imposed
21+
/// (eg, it cannot start with a -).
22+
pub fn name_is_valid(tag_name: &str) -> Result<bool, Error> {
23+
crate::init();
24+
let tag_name = CString::new(tag_name)?;
25+
let mut valid: libc::c_int = 0;
26+
unsafe {
27+
try_call!(raw::git_tag_name_is_valid(&mut valid, tag_name.as_ptr()));
28+
}
29+
Ok(valid == 1)
30+
}
31+
1832
/// Get the id (SHA1) of a repository tag
1933
pub fn id(&self) -> Oid {
2034
unsafe { Binding::from_raw(raw::git_tag_id(&*self.raw)) }
@@ -141,6 +155,29 @@ impl<'repo> Drop for Tag<'repo> {
141155

142156
#[cfg(test)]
143157
mod tests {
158+
use crate::Tag;
159+
160+
// Reference -- https://git-scm.com/docs/git-check-ref-format
161+
#[test]
162+
fn name_is_valid() {
163+
assert_eq!(Tag::name_is_valid("blah_blah").unwrap(), true);
164+
assert_eq!(Tag::name_is_valid("v1.2.3").unwrap(), true);
165+
assert_eq!(Tag::name_is_valid("my/tag").unwrap(), true);
166+
assert_eq!(Tag::name_is_valid("@").unwrap(), true);
167+
168+
assert_eq!(Tag::name_is_valid("-foo").unwrap(), false);
169+
assert_eq!(Tag::name_is_valid("foo:bar").unwrap(), false);
170+
assert_eq!(Tag::name_is_valid("foo^bar").unwrap(), false);
171+
assert_eq!(Tag::name_is_valid("foo.").unwrap(), false);
172+
assert_eq!(Tag::name_is_valid("@{").unwrap(), false);
173+
assert_eq!(Tag::name_is_valid("as\\cd").unwrap(), false);
174+
175+
assert_eq!(
176+
Tag::name_is_valid("ab\012").err().unwrap().to_string(),
177+
"data contained a nul byte that could not be represented as a string"
178+
);
179+
}
180+
144181
#[test]
145182
fn smoke() {
146183
let (_td, repo) = crate::test::repo_init();

0 commit comments

Comments
 (0)