Merge pull request #6395 from arroz/fix/nonexistent-worktree-lookup-error-code

ethomson · web-flow · commit d78fad1519fa · 2022-09-19T10:59:58.000+01:00
#6366: When a worktree is missing, return GIT_ENOTFOUND.
diff --git a/src/libgit2/worktree.c b/src/libgit2/worktree.c
@@ -187,6 +187,11 @@ int git_worktree_lookup(git_worktree **out, git_repository *repo, const char *na
 	if ((error = git_str_join3(&path, '/', repo->commondir, "worktrees", name)) < 0)
 		goto out;
 
+	if (!git_fs_path_isdir(path.ptr)) {
+		error = GIT_ENOTFOUND;
+		goto out;
+	}
+
 	if ((error = (open_worktree_dir(out, git_repository_workdir(repo), path.ptr, name))) < 0)
 		goto out;
 
diff --git a/tests/libgit2/worktree/worktree.c b/tests/libgit2/worktree/worktree.c
@@ -120,7 +120,7 @@ void test_worktree_worktree__lookup_nonexistent_worktree(void)
 {
 	git_worktree *wt;
 
-	cl_git_fail(git_worktree_lookup(&wt, fixture.repo, "nonexistent"));
+	cl_git_fail_with(GIT_ENOTFOUND, git_worktree_lookup(&wt, fixture.repo, "nonexistent"));
 	cl_assert_equal_p(wt, NULL);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ void test_worktree_worktree__lookup_nonexistent_worktree(void)`
`120`	`120`	`{`
`121`	`121`	`git_worktree *wt;`
`122`	`122`
`123`		`- cl_git_fail(git_worktree_lookup(&wt, fixture.repo, "nonexistent"));`
	`123`	`+ cl_git_fail_with(GIT_ENOTFOUND, git_worktree_lookup(&wt, fixture.repo, "nonexistent"));`
`124`	`124`	`cl_assert_equal_p(wt, NULL);`
`125`	`125`	`}`
`126`	`126`