Commit 726c6fd29327700f8af0dc28d13e4802b4af56c7
2011-05-17T17:00:37
commit.c: Move to new error handling mechanism
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
diff --git a/src/commit.c b/src/commit.c
index 54d7a47..0d99c0e 100644
--- a/src/commit.c
+++ b/src/commit.c
@@ -102,6 +102,9 @@ int git_commit_create_v(
tree_oid, parent_count, oids);
free((void *)oids);
+
+ if (error < GIT_SUCCESS)
+ return git__rethrow(error, "Failed to create commit");
return error;
}
@@ -133,6 +136,9 @@ int git_commit_create_ov(
parent_count, oids);
free((void *)oids);
+
+ if (error < GIT_SUCCESS)
+ return git__rethrow(error, "Failed to create commit");
return error;
}
@@ -161,6 +167,9 @@ int git_commit_create_o(
parent_count, oids);
free((void *)oids);
+
+ if (error < GIT_SUCCESS)
+ return git__rethrow(error, "Failed to create commit");
return error;
}
@@ -197,7 +206,7 @@ int git_commit_create(
final_size += 1 + message_length;
if ((error = git_odb_open_wstream(&stream, repo->db, final_size, GIT_OBJ_COMMIT)) < GIT_SUCCESS)
- return error;
+ return git__rethrow(error, "Failed to create commit");
git__write_oid(stream, "tree", tree_oid);
@@ -222,12 +231,12 @@ int git_commit_create(
error = git_reference_lookup(&head, repo, update_ref);
if (error < GIT_SUCCESS)
- return error;
+ return git__rethrow(error, "Failed to create commit");
error = git_reference_resolve(&head, head);
if (error < GIT_SUCCESS) {
if (error != GIT_ENOTFOUND)
- return error;
+ return git__rethrow(error, "Failed to create commit");
/*
* The target of the reference was not found. This can happen
* just after a repository has been initialized (the master
@@ -241,6 +250,8 @@ int git_commit_create(
error = git_reference_set_oid(head, oid);
}
+ if (error < GIT_SUCCESS)
+ return git__rethrow(error, "Failed to create commit");
return error;
}
@@ -255,7 +266,7 @@ int commit_parse_buffer(git_commit *commit, const void *data, size_t len)
git_vector_init(&commit->parent_oids, 4, NULL);
if ((error = git__parse_oid(&commit->tree_oid, &buffer, buffer_end, "tree ")) < GIT_SUCCESS)
- return error;
+ return git__rethrow(error, "Failed to parse buffer");
/*
* TODO: commit grafts!
@@ -273,12 +284,12 @@ int commit_parse_buffer(git_commit *commit, const void *data, size_t len)
commit->author = git__malloc(sizeof(git_signature));
if ((error = git_signature__parse(commit->author, &buffer, buffer_end, "author ")) < GIT_SUCCESS)
- return error;
+ return git__rethrow(error, "Failed to parse buffer");
/* Always parse the committer; we need the commit time */
commit->committer = git__malloc(sizeof(git_signature));
if ((error = git_signature__parse(commit->committer, &buffer, buffer_end, "committer ")) < GIT_SUCCESS)
- return error;
+ return git__rethrow(error, "Failed to parse buffer");
/* parse commit message */
while (buffer <= buffer_end && *buffer == '\n')
@@ -343,7 +354,7 @@ int git_commit_parent(git_commit **parent, git_commit *commit, unsigned int n)
parent_oid = git_vector_get(&commit->parent_oids, n);
if (parent_oid == NULL)
- return GIT_ENOTFOUND;
+ return git__throw(GIT_ENOTFOUND, "Failed to get parent. Parent does not exist");
return git_commit_lookup(parent, commit->object.repo, parent_oid);
}