mirror of
https://github.com/git/git.git
synced 2024-10-02 07:41:22 +02:00
notes-utils: convert internals to struct object_id
Convert the internals of create_notes_comit and commit_notes to use struct object_id. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
8eb9460045
commit
18b74e513d
@ -7,18 +7,18 @@ void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
|
|||||||
const char *msg, size_t msg_len,
|
const char *msg, size_t msg_len,
|
||||||
unsigned char *result_sha1)
|
unsigned char *result_sha1)
|
||||||
{
|
{
|
||||||
unsigned char tree_sha1[20];
|
struct object_id tree_oid;
|
||||||
|
|
||||||
assert(t->initialized);
|
assert(t->initialized);
|
||||||
|
|
||||||
if (write_notes_tree(t, tree_sha1))
|
if (write_notes_tree(t, tree_oid.hash))
|
||||||
die("Failed to write notes tree to database");
|
die("Failed to write notes tree to database");
|
||||||
|
|
||||||
if (!parents) {
|
if (!parents) {
|
||||||
/* Deduce parent commit from t->ref */
|
/* Deduce parent commit from t->ref */
|
||||||
unsigned char parent_sha1[20];
|
struct object_id parent_oid;
|
||||||
if (!read_ref(t->ref, parent_sha1)) {
|
if (!read_ref(t->ref, parent_oid.hash)) {
|
||||||
struct commit *parent = lookup_commit(parent_sha1);
|
struct commit *parent = lookup_commit(parent_oid.hash);
|
||||||
if (parse_commit(parent))
|
if (parse_commit(parent))
|
||||||
die("Failed to find/parse commit %s", t->ref);
|
die("Failed to find/parse commit %s", t->ref);
|
||||||
commit_list_insert(parent, &parents);
|
commit_list_insert(parent, &parents);
|
||||||
@ -26,14 +26,14 @@ void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
|
|||||||
/* else: t->ref points to nothing, assume root/orphan commit */
|
/* else: t->ref points to nothing, assume root/orphan commit */
|
||||||
}
|
}
|
||||||
|
|
||||||
if (commit_tree(msg, msg_len, tree_sha1, parents, result_sha1, NULL, NULL))
|
if (commit_tree(msg, msg_len, tree_oid.hash, parents, result_sha1, NULL, NULL))
|
||||||
die("Failed to commit notes tree to database");
|
die("Failed to commit notes tree to database");
|
||||||
}
|
}
|
||||||
|
|
||||||
void commit_notes(struct notes_tree *t, const char *msg)
|
void commit_notes(struct notes_tree *t, const char *msg)
|
||||||
{
|
{
|
||||||
struct strbuf buf = STRBUF_INIT;
|
struct strbuf buf = STRBUF_INIT;
|
||||||
unsigned char commit_sha1[20];
|
struct object_id commit_oid;
|
||||||
|
|
||||||
if (!t)
|
if (!t)
|
||||||
t = &default_notes_tree;
|
t = &default_notes_tree;
|
||||||
@ -46,9 +46,9 @@ void commit_notes(struct notes_tree *t, const char *msg)
|
|||||||
strbuf_addstr(&buf, msg);
|
strbuf_addstr(&buf, msg);
|
||||||
strbuf_complete_line(&buf);
|
strbuf_complete_line(&buf);
|
||||||
|
|
||||||
create_notes_commit(t, NULL, buf.buf, buf.len, commit_sha1);
|
create_notes_commit(t, NULL, buf.buf, buf.len, commit_oid.hash);
|
||||||
strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
|
strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
|
||||||
update_ref(buf.buf, t->update_ref, commit_sha1, NULL, 0,
|
update_ref(buf.buf, t->update_ref, commit_oid.hash, NULL, 0,
|
||||||
UPDATE_REFS_DIE_ON_ERR);
|
UPDATE_REFS_DIE_ON_ERR);
|
||||||
|
|
||||||
strbuf_release(&buf);
|
strbuf_release(&buf);
|
||||||
|
Loading…
Reference in New Issue
Block a user