Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
notes-utils: convert internals to struct object_id
author
brian m. carlson
<sandals@crustytoothpaste.net>
Sat, 6 May 2017 22:10:04 +0000
(22:10 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 8 May 2017 06:12:57 +0000
(15:12 +0900)
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>
notes-utils.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
8eb9460
)
diff --git
a/notes-utils.c
b/notes-utils.c
index 24a33616a47737e6ae8cf917080cbb314dcf2762..36c1490aa782dfda49bccc416b8cc733adeafc70 100644
(file)
--- a/
notes-utils.c
+++ b/
notes-utils.c
@@
-7,18
+7,18
@@
void create_notes_commit(struct notes_tree *t, struct commit_list *parents,
const char *msg, size_t msg_len,
unsigned char *result_sha1)
{
const char *msg, size_t msg_len,
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");
if (!parents) {
/* Deduce parent commit from t->ref */
die("Failed to write notes tree to database");
if (!parents) {
/* Deduce parent commit from t->ref */
-
unsigned char parent_sha1[20]
;
- if (!read_ref(t->ref, parent_
sha1
)) {
- struct commit *parent = lookup_commit(parent_
sha1
);
+
struct object_id parent_oid
;
+ if (!read_ref(t->ref, parent_
oid.hash
)) {
+ struct commit *parent = lookup_commit(parent_
oid.hash
);
if (parse_commit(parent))
die("Failed to find/parse commit %s", t->ref);
commit_list_insert(parent, &parents);
if (parse_commit(parent))
die("Failed to find/parse commit %s", t->ref);
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");
}
void commit_notes(struct notes_tree *t, const char *msg)
{
struct strbuf buf = STRBUF_INIT;
die("Failed to commit notes tree to database");
}
void commit_notes(struct notes_tree *t, const char *msg)
{
struct strbuf buf = STRBUF_INIT;
-
unsigned char commit_sha1[20]
;
+
struct object_id commit_oid
;
if (!t)
t = &default_notes_tree;
if (!t)
t = &default_notes_tree;
@@
-46,9
+46,9
@@
void commit_notes(struct notes_tree *t, const char *msg)
strbuf_addstr(&buf, msg);
strbuf_complete_line(&buf);
strbuf_addstr(&buf, msg);
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);
strbuf_release(&buf);
UPDATE_REFS_DIE_ON_ERR);
strbuf_release(&buf);