Commit 1da6329f by Etienne Samson

worktree: don't return "untyped" negative numbers as error codes

parent 292a6eca
...@@ -234,37 +234,30 @@ void git_worktree_free(git_worktree *wt) ...@@ -234,37 +234,30 @@ void git_worktree_free(git_worktree *wt)
int git_worktree_validate(const git_worktree *wt) int git_worktree_validate(const git_worktree *wt)
{ {
int err = 0;
assert(wt); assert(wt);
if (!is_worktree_dir(wt->gitdir_path)) { if (!is_worktree_dir(wt->gitdir_path)) {
giterr_set(GITERR_WORKTREE, giterr_set(GITERR_WORKTREE,
"Worktree gitdir ('%s') is not valid", "Worktree gitdir ('%s') is not valid",
wt->gitlink_path); wt->gitlink_path);
err = -1; return GIT_ERROR;
goto out;
} }
if (wt->parent_path && !git_path_exists(wt->parent_path)) { if (wt->parent_path && !git_path_exists(wt->parent_path)) {
giterr_set(GITERR_WORKTREE, giterr_set(GITERR_WORKTREE,
"Worktree parent directory ('%s') does not exist ", "Worktree parent directory ('%s') does not exist ",
wt->parent_path); wt->parent_path);
err = -2; return GIT_ERROR;
goto out;
} }
if (!git_path_exists(wt->commondir_path)) { if (!git_path_exists(wt->commondir_path)) {
giterr_set(GITERR_WORKTREE, giterr_set(GITERR_WORKTREE,
"Worktree common directory ('%s') does not exist ", "Worktree common directory ('%s') does not exist ",
wt->commondir_path); wt->commondir_path);
err = -3; return GIT_ERROR;
goto out;
} }
out: return 0;
return err;
} }
int git_worktree_add_init_options(git_worktree_add_options *opts, int git_worktree_add_init_options(git_worktree_add_options *opts,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment