Merge pull request #2686 from ethomson/rename_notfound

Propogate GIT_ENOTFOUND from git_remote_rename
This commit is contained in:
Carlos Martín Nieto 2014-11-03 22:27:11 +01:00
commit 3f8d005a82
2 changed files with 10 additions and 1 deletions

View File

@ -1677,7 +1677,7 @@ int git_remote_rename(git_strarray *out, git_repository *repo, const char *name,
assert(out && repo && name && new_name); assert(out && repo && name && new_name);
if ((error = git_remote_load(&remote, repo, name)) < 0) if ((error = git_remote_load(&remote, repo, name)) < 0)
return -1; return error;
if ((error = ensure_remote_name_is_valid(new_name)) < 0) if ((error = ensure_remote_name_is_valid(new_name)) < 0)
goto cleanup; goto cleanup;

View File

@ -200,6 +200,15 @@ void test_network_remote_rename__overwrite_ref_in_target(void)
git_branch_iterator_free(iter); git_branch_iterator_free(iter);
} }
void test_network_remote_rename__nonexistent_returns_enotfound(void)
{
git_strarray problems = {0};
int err = git_remote_rename(&problems, _repo, "nonexistent", "renamed");
cl_assert_equal_i(GIT_ENOTFOUND, err);
}
void test_network_remote_rename__symref_head(void) void test_network_remote_rename__symref_head(void)
{ {
int error; int error;