Commit 805dc2a08855364663e7d1cca45dd58318907883
2011-09-20T15:52:16
Merge pull request #415 from schu/ref-rename-regression refs: fix git_reference_rename()
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
diff --git a/src/refs.c b/src/refs.c
index bc8827b..3711759 100644
--- a/src/refs.c
+++ b/src/refs.c
@@ -1287,8 +1287,13 @@ int git_reference_rename(git_reference *ref, const char *new_name, int force)
error = git_reference_delete(new_ref);
}
- if (error < GIT_SUCCESS && error != GIT_ENOTFOUND)
- goto cleanup;
+ if (error < GIT_SUCCESS) {
+ git_path_join(aux_path, ref->owner->path_repository, new_name);
+ /* If we couldn't read the reference because it doesn't
+ * exist it's ok - otherwise return */
+ if (git_futils_isfile(aux_path) == GIT_SUCCESS)
+ goto cleanup;
+ }
if ((error = reference_available(ref->owner, new_name, ref->name)) < GIT_SUCCESS)
return git__rethrow(error, "Failed to rename reference. Reference already exists");
@@ -1328,9 +1333,7 @@ int git_reference_rename(git_reference *ref, const char *new_name, int force)
git_hashtable_remove(ref->owner->references.loose_cache, old_name);
}
- /* build new path */
git_path_join(aux_path, ref->owner->path_repository, new_name);
-
if (git_futils_exists(aux_path) == GIT_SUCCESS) {
if (git_futils_isdir(aux_path) == GIT_SUCCESS) {
if ((error = git_futils_rmdir_r(aux_path, 0)) < GIT_SUCCESS)
diff --git a/tests/t10-refs.c b/tests/t10-refs.c
index 65fbdd6..6703415 100644
--- a/tests/t10-refs.c
+++ b/tests/t10-refs.c
@@ -751,6 +751,35 @@ BEGIN_TEST(rename8, "can be renamed to a new name prefixed with the old name")
close_temp_repo(repo);
END_TEST
+BEGIN_TEST(rename9, "can move a reference to a upper reference hierarchy")
+ git_reference *ref, *ref_two, *looked_up_ref;
+ git_repository *repo;
+ git_oid id;
+
+ must_pass(open_temp_repo(&repo, REPOSITORY_FOLDER));
+
+ must_pass(git_reference_lookup(&ref, repo, ref_master_name));
+ must_be_true(ref->type & GIT_REF_OID);
+
+ git_oid_cpy(&id, git_reference_oid(ref));
+
+ /* Create loose references */
+ must_pass(git_reference_create_oid(&ref_two, repo, ref_two_name_new, &id, 0));
+
+ /* An existing reference... */
+ must_pass(git_reference_lookup(&looked_up_ref, repo, ref_two_name_new));
+
+ /* Can be renamed upward the reference tree. */
+ must_pass(git_reference_rename(looked_up_ref, ref_two_name, 0));
+
+ /* Check we actually renamed it */
+ must_pass(git_reference_lookup(&looked_up_ref, repo, ref_two_name));
+ must_be_true(!strcmp(looked_up_ref->name, ref_two_name));
+ must_fail(git_reference_lookup(&looked_up_ref, repo, ref_two_name_new));
+
+ close_temp_repo(repo);
+END_TEST
+
BEGIN_TEST(delete0, "deleting a ref which is both packed and loose should remove both tracks in the filesystem")
git_reference *looked_up_ref, *another_looked_up_ref;
git_repository *repo;
@@ -1141,6 +1170,7 @@ BEGIN_SUITE(refs)
ADD_TEST(rename6);
ADD_TEST(rename7);
ADD_TEST(rename8);
+ ADD_TEST(rename9);
ADD_TEST(delete0);