Commit ac4fcf173d0d6797a71c24de5f3bbeb1770e2888
2011-05-31T11:56:39
Modify git_tag_create_frombuffer: the buffer is not modified when writen to the odb libgit2 has now the same behaviour of git when adding a tag with a buffer.
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
diff --git a/src/tag.c b/src/tag.c
index 6a70efd..8cae17a 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -304,20 +304,49 @@ int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *bu
{
git_tag tag;
int error;
-
+ git_odb_stream *stream;
+
assert(oid && buffer);
-
+
memset(&tag, 0, sizeof(tag));
-
+
+ /* validate the buffer */
+
if ((error = parse_tag_buffer(&tag, buffer, buffer + strlen(buffer))) < GIT_SUCCESS)
return git__rethrow(error, "Failed to create tag");
-
- error = git_tag_create(oid, repo, tag.tag_name, &tag.target, tag.type, tag.tagger, tag.message);
-
+
+ git_reference *new_ref;
+ char ref_name[MAX_GITDIR_TREE_STRUCTURE_PATH_LENGTH];
+
+ if ((error = tag_valid_in_odb(&new_ref, ref_name, &tag.target, tag.type, repo, tag.tag_name)) < GIT_SUCCESS)
+ return git__rethrow(error, "Failed to create tag");
+
+ if(new_ref != NULL) {
+ git_oid_cpy(oid, git_reference_oid(new_ref));
+ return git__throw(GIT_EEXISTS, "Tag already exists");
+ }
+
+
+ /* write the buffer */
+
+ if ((error = git_odb_open_wstream(&stream, repo->db, strlen(buffer), GIT_OBJ_TAG)) < GIT_SUCCESS)
+ return git__rethrow(error, "Failed to create tag");
+
+ stream->write(stream, buffer, strlen(buffer));
+
+ error = stream->finalize_write(oid, stream);
+ stream->free(stream);
+
+ if (error < GIT_SUCCESS)
+ return git__rethrow(error, "Failed to create tag");
+
+
+ error = git_reference_create_oid(&new_ref, repo, ref_name, oid);
+
git_signature_free(tag.tagger);
free(tag.tag_name);
free(tag.message);
-
+
return error == GIT_SUCCESS ? GIT_SUCCESS : git__rethrow(error, "Failed to create tag");
}