Commit 1589a93aa6c7239423201465ceaddf461e98ac26
2015-02-02T16:50:10
Fix branch creation when branch name matches namespace of previously deleted branch
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 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132
diff --git a/src/refdb_fs.c b/src/refdb_fs.c
index fc41a95..5cd2112 100644
--- a/src/refdb_fs.c
+++ b/src/refdb_fs.c
@@ -1771,6 +1771,15 @@ static int reflog_append(refdb_fs_backend *backend, const git_reference *ref, co
goto cleanup;
}
+ /* If the new branch matches part of the namespace of a previously deleted branch,
+ * there maybe an obsolete/unused directory (or directory hierarchy) in the way.
+ */
+ if (git_path_isdir(git_buf_cstr(&path)) &&
+ (git_futils_rmdir_r(git_buf_cstr(&path), NULL, GIT_RMDIR_SKIP_NONEMPTY) < 0)) {
+ error = -1;
+ goto cleanup;
+ }
+
error = git_futils_writebuffer(&buf, git_buf_cstr(&path), O_WRONLY|O_CREAT|O_APPEND, GIT_REFLOG_FILE_MODE);
cleanup:
diff --git a/tests/refs/branches/create.c b/tests/refs/branches/create.c
index 3a4f33b..af9963b 100644
--- a/tests/refs/branches/create.c
+++ b/tests/refs/branches/create.c
@@ -196,3 +196,107 @@ void test_refs_branches_create__can_create_branch_with_unicode(void)
branch = NULL;
}
}
+
+/**
+ * Verify that we can create a branch with a name that matches the
+ * namespace of a previously delete branch.
+ *
+ * git branch level_one/level_two
+ * git branch -D level_one/level_two
+ * git branch level_one
+ *
+ * We expect the delete to have deleted the files:
+ * ".git/refs/heads/level_one/level_two"
+ * ".git/logs/refs/heads/level_one/level_two"
+ * It may or may not have deleted the (now empty)
+ * containing directories. To match git.git behavior,
+ * the second create needs to implicilty delete the
+ * directories and create the new files.
+ * "refs/heads/level_one"
+ * "logs/refs/heads/level_one"
+ *
+ * We should not fail to create the branch or its
+ * reflog because of an obsolete namespace container
+ * directory.
+ */
+void test_refs_branches_create__name_vs_namespace(void)
+{
+ const char * name;
+ struct item {
+ const char *first;
+ const char *second;
+ };
+ static const struct item item[] = {
+ { "level_one/level_two", "level_one" },
+ { "a/b/c/d/e", "a/b/c/d" },
+ { "ss/tt/uu/vv/ww", "ss" },
+ /* And one test case that is deeper. */
+ { "xx1/xx2/xx3/xx4", "xx1/xx2/xx3/xx4/xx5/xx6" },
+ { NULL, NULL },
+ };
+ const struct item *p;
+
+ retrieve_known_commit(&target, repo);
+
+ for (p=item; p->first; p++) {
+ cl_git_pass(git_branch_create(&branch, repo, p->first, target, 0, NULL, NULL));
+ cl_git_pass(git_oid_cmp(git_reference_target(branch), git_commit_id(target)));
+ cl_git_pass(git_branch_name(&name, branch));
+ cl_assert_equal_s(name, p->first);
+
+ cl_git_pass(git_branch_delete(branch));
+ git_reference_free(branch);
+ branch = NULL;
+
+ cl_git_pass(git_branch_create(&branch, repo, p->second, target, 0, NULL, NULL));
+ git_reference_free(branch);
+ branch = NULL;
+ }
+}
+
+/**
+ * We still need to fail if part of the namespace is
+ * still in use.
+ */
+void test_refs_branches_create__name_vs_namespace_fail(void)
+{
+ const char * name;
+ struct item {
+ const char *first;
+ const char *first_alternate;
+ const char *second;
+ };
+ static const struct item item[] = {
+ { "level_one/level_two", "level_one/alternate", "level_one" },
+ { "a/b/c/d/e", "a/b/c/d/alternate", "a/b/c/d" },
+ { "ss/tt/uu/vv/ww", "ss/alternate", "ss" },
+ { NULL, NULL, NULL },
+ };
+ const struct item *p;
+
+ retrieve_known_commit(&target, repo);
+
+ for (p=item; p->first; p++) {
+ cl_git_pass(git_branch_create(&branch, repo, p->first, target, 0, NULL, NULL));
+ cl_git_pass(git_oid_cmp(git_reference_target(branch), git_commit_id(target)));
+ cl_git_pass(git_branch_name(&name, branch));
+ cl_assert_equal_s(name, p->first);
+
+ cl_git_pass(git_branch_delete(branch));
+ git_reference_free(branch);
+ branch = NULL;
+
+ cl_git_pass(git_branch_create(&branch, repo, p->first_alternate, target, 0, NULL, NULL));
+ cl_git_pass(git_oid_cmp(git_reference_target(branch), git_commit_id(target)));
+ cl_git_pass(git_branch_name(&name, branch));
+ cl_assert_equal_s(name, p->first_alternate);
+
+ /* we do not delete the alternate. */
+ git_reference_free(branch);
+ branch = NULL;
+
+ cl_git_fail(git_branch_create(&branch, repo, p->second, target, 0, NULL, NULL));
+ git_reference_free(branch);
+ branch = NULL;
+ }
+}