Commit 3ecdf9106596906e74c54e1e956c289fdea89b88
2011-05-31T11:53:09
Modify create_tag : verifications are now done in an another function This commit create a function called tag_valid_in_odb which validate a tag before its creation. This function will be needed by my next commit.
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
diff --git a/src/tag.c b/src/tag.c
index 6ae51b6..6a70efd 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -177,6 +177,46 @@ static int retreive_tag_reference(git_reference **tag_reference_out, char *ref_n
return GIT_SUCCESS;
}
+/* tag_reference_out will contain the reference of the tag if exists, otherwise NULL */
+static int tag_valid_in_odb(
+ git_reference **tag_reference_out,
+ char *ref_name_out,
+ const git_oid *target,
+ git_otype target_type,
+ git_repository *repo,
+ const char *tag_name) {
+
+ int error;
+
+ *tag_reference_out = NULL;
+
+
+ error = retreive_tag_reference(tag_reference_out, ref_name_out, repo, tag_name);
+
+ switch (error) {
+ case GIT_SUCCESS:
+ /* Fall trough */
+ case GIT_ENOTFOUND:
+ break;
+
+ default:
+ return git__rethrow(error, "Failed to create tag");
+ }
+
+ if (!git_odb_exists(repo->db, target))
+ return git__throw(GIT_ENOTFOUND, "Failed to create tag. Object to tag doesn't exist");
+
+ /* Try to find out what the type is */
+ if (target_type == GIT_OBJ_ANY) {
+ size_t _unused;
+ error = git_odb_read_header(&_unused, &target_type, repo->db, target);
+ if (error < GIT_SUCCESS)
+ return git__rethrow(error, "Failed to create tag");
+ }
+
+ return GIT_SUCCESS;
+}
+
static int tag_create(
git_oid *oid,
git_repository *repo,
@@ -199,36 +239,18 @@ static int tag_create(
int type_str_len, tag_name_len, tagger_str_len, message_len;
int error, should_update_ref = 0;
+ if ((error = tag_valid_in_odb(&new_ref, ref_name, target, target_type, repo, tag_name)) < GIT_SUCCESS)
+ return git__rethrow(error, "Failed to create tag");
+
/** Ensure the tag name doesn't conflict with an already existing
- reference unless overwriting has explictly been requested **/
- error = retreive_tag_reference(&new_ref, ref_name, repo, tag_name);
-
- switch (error) {
- case GIT_SUCCESS:
- if (!allow_ref_overwrite) {
+ * reference unless overwriting has explictly been requested **/
+ if(new_ref != NULL) {
+ if(!allow_ref_overwrite) {
git_oid_cpy(oid, git_reference_oid(new_ref));
return git__throw(GIT_EEXISTS, "Tag already exists");
+ } else {
+ should_update_ref = 1;
}
- should_update_ref = 1;
-
- /* Fall trough */
-
- case GIT_ENOTFOUND:
- break;
-
- default:
- return git__rethrow(error, "Failed to create tag");
- }
-
- if (!git_odb_exists(repo->db, target))
- return git__throw(GIT_ENOTFOUND, "Failed to create tag. Object to tag doesn't exist");
-
- /* Try to find out what the type is */
- if (target_type == GIT_OBJ_ANY) {
- size_t _unused;
- error = git_odb_read_header(&_unused, &target_type, repo->db, target);
- if (error < GIT_SUCCESS)
- return git__rethrow(error, "Failed to create tag");
}
type_str = git_object_type2string(target_type);