Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
e497b16c
Commit
e497b16c
authored
Sep 17, 2012
by
nulltoken
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remote: prevent from saving a nameless remote
parent
aba70781
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
54 additions
and
4 deletions
+54
-4
src/remote.c
+29
-0
tests-clar/network/remotes.c
+25
-4
No files found.
src/remote.c
View file @
e497b16c
...
@@ -201,6 +201,30 @@ cleanup:
...
@@ -201,6 +201,30 @@ cleanup:
return
error
;
return
error
;
}
}
static
int
ensure_remote_name_is_valid
(
const
char
*
name
)
{
git_buf
buf
=
GIT_BUF_INIT
;
git_refspec
refspec
;
int
error
=
-
1
;
if
(
!
name
||
*
name
==
'\0'
)
goto
cleanup
;
git_buf_printf
(
&
buf
,
"refs/heads/test:refs/remotes/%s/test"
,
name
);
error
=
git_refspec__parse
(
&
refspec
,
git_buf_cstr
(
&
buf
),
true
);
git_buf_free
(
&
buf
);
git_refspec__free
(
&
refspec
);
cleanup:
if
(
error
)
giterr_set
(
GITERR_CONFIG
,
"'%s' is not a valid remote name."
,
name
);
return
error
;
}
int
git_remote_save
(
const
git_remote
*
remote
)
int
git_remote_save
(
const
git_remote
*
remote
)
{
{
int
error
;
int
error
;
...
@@ -208,6 +232,11 @@ int git_remote_save(const git_remote *remote)
...
@@ -208,6 +232,11 @@ int git_remote_save(const git_remote *remote)
const
char
*
tagopt
=
NULL
;
const
char
*
tagopt
=
NULL
;
git_buf
buf
=
GIT_BUF_INIT
,
value
=
GIT_BUF_INIT
;
git_buf
buf
=
GIT_BUF_INIT
,
value
=
GIT_BUF_INIT
;
assert
(
remote
);
if
(
ensure_remote_name_is_valid
(
remote
->
name
)
<
0
)
return
-
1
;
if
(
git_repository_config__weakptr
(
&
config
,
remote
->
repo
)
<
0
)
if
(
git_repository_config__weakptr
(
&
config
,
remote
->
repo
)
<
0
)
return
-
1
;
return
-
1
;
...
...
tests-clar/network/remotes.c
View file @
e497b16c
...
@@ -10,9 +10,8 @@ static const git_refspec *_refspec;
...
@@ -10,9 +10,8 @@ static const git_refspec *_refspec;
void
test_network_remotes__initialize
(
void
)
void
test_network_remotes__initialize
(
void
)
{
{
cl_fixture_sandbox
(
"testrepo.git"
);
_repo
=
cl_git_sandbox_init
(
"testrepo.git"
);
cl_git_pass
(
git_repository_open
(
&
_repo
,
"testrepo.git"
));
cl_git_pass
(
git_remote_load
(
&
_remote
,
_repo
,
"test"
));
cl_git_pass
(
git_remote_load
(
&
_remote
,
_repo
,
"test"
));
_refspec
=
git_remote_fetchspec
(
_remote
);
_refspec
=
git_remote_fetchspec
(
_remote
);
...
@@ -22,8 +21,7 @@ void test_network_remotes__initialize(void)
...
@@ -22,8 +21,7 @@ void test_network_remotes__initialize(void)
void
test_network_remotes__cleanup
(
void
)
void
test_network_remotes__cleanup
(
void
)
{
{
git_remote_free
(
_remote
);
git_remote_free
(
_remote
);
git_repository_free
(
_repo
);
cl_git_sandbox_cleanup
();
cl_fixture_cleanup
(
"testrepo.git"
);
}
}
void
test_network_remotes__parsing
(
void
)
void
test_network_remotes__parsing
(
void
)
...
@@ -226,6 +224,29 @@ void test_network_remotes__add(void)
...
@@ -226,6 +224,29 @@ void test_network_remotes__add(void)
cl_assert_equal_s
(
git_remote_url
(
_remote
),
"http://github.com/libgit2/libgit2"
);
cl_assert_equal_s
(
git_remote_url
(
_remote
),
"http://github.com/libgit2/libgit2"
);
}
}
void
test_network_remotes__cannot_add_a_nameless_remote
(
void
)
{
git_remote
*
remote
;
cl_git_fail
(
git_remote_add
(
&
remote
,
_repo
,
NULL
,
"git://github.com/libgit2/libgit2"
));
cl_git_fail
(
git_remote_add
(
&
remote
,
_repo
,
""
,
"git://github.com/libgit2/libgit2"
));
}
void
test_network_remotes__cannot_save_a_nameless_remote
(
void
)
{
git_remote
*
remote
;
cl_git_pass
(
git_remote_new
(
&
remote
,
_repo
,
NULL
,
"git://github.com/libgit2/libgit2"
,
NULL
));
cl_git_fail
(
git_remote_save
(
remote
));
git_remote_free
(
remote
);
cl_git_pass
(
git_remote_new
(
&
remote
,
_repo
,
""
,
"git://github.com/libgit2/libgit2"
,
NULL
));
cl_git_fail
(
git_remote_save
(
remote
));
git_remote_free
(
remote
);
}
void
test_network_remotes__tagopt
(
void
)
void
test_network_remotes__tagopt
(
void
)
{
{
const
char
*
opt
;
const
char
*
opt
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment