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
c8fe4da3
Unverified
Commit
c8fe4da3
authored
Nov 21, 2020
by
Edward Thomson
Committed by
GitHub
Nov 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply suggestions from code review
parent
303b4c68
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
2 deletions
+2
-2
src/worktree.c
+1
-1
tests/worktree/worktree.c
+1
-0
tests/worktree/worktree_helpers.c
+0
-1
No files found.
src/worktree.c
View file @
c8fe4da3
...
@@ -262,7 +262,7 @@ int git_worktree_validate(const git_worktree *wt)
...
@@ -262,7 +262,7 @@ int git_worktree_validate(const git_worktree *wt)
if
(
!
git_path_exists
(
wt
->
worktree_path
))
{
if
(
!
git_path_exists
(
wt
->
worktree_path
))
{
git_error_set
(
GIT_ERROR_WORKTREE
,
git_error_set
(
GIT_ERROR_WORKTREE
,
"worktree directory
('%s') does not exist
"
,
"worktree directory
'%s' does not exist
"
,
wt
->
worktree_path
);
wt
->
worktree_path
);
return
GIT_ERROR
;
return
GIT_ERROR
;
}
}
...
...
tests/worktree/worktree.c
View file @
c8fe4da3
...
@@ -618,6 +618,7 @@ void test_worktree_worktree__validate_invalid_worktreedir(void)
...
@@ -618,6 +618,7 @@ void test_worktree_worktree__validate_invalid_worktreedir(void)
cl_git_pass
(
git_worktree_lookup
(
&
wt
,
fixture
.
repo
,
"testrepo-worktree"
));
cl_git_pass
(
git_worktree_lookup
(
&
wt
,
fixture
.
repo
,
"testrepo-worktree"
));
p_rename
(
"testrepo-worktree"
,
"testrepo-worktree-tmp"
);
p_rename
(
"testrepo-worktree"
,
"testrepo-worktree-tmp"
);
cl_git_fail
(
git_worktree_validate
(
wt
));
cl_git_fail
(
git_worktree_validate
(
wt
));
p_rename
(
"testrepo-worktree-tmp"
,
"testrepo-worktree"
);
git_worktree_free
(
wt
);
git_worktree_free
(
wt
);
}
}
tests/worktree/worktree_helpers.c
View file @
c8fe4da3
...
@@ -19,7 +19,6 @@ void cleanup_fixture_worktree(worktree_fixture *fixture)
...
@@ -19,7 +19,6 @@ void cleanup_fixture_worktree(worktree_fixture *fixture)
cl_fixture_cleanup
(
fixture
->
reponame
);
cl_fixture_cleanup
(
fixture
->
reponame
);
if
(
fixture
->
worktreename
)
if
(
fixture
->
worktreename
)
cl_fixture_cleanup
(
fixture
->
worktreename
);
cl_fixture_cleanup
(
fixture
->
worktreename
);
p_rename
(
"testrepo-worktree-tmp"
,
"testrepo-worktree"
);
}
}
void
setup_fixture_worktree
(
worktree_fixture
*
fixture
)
void
setup_fixture_worktree
(
worktree_fixture
*
fixture
)
...
...
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