mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit: convert commit_tree* to object_id

Browse Source 
Convert the definitions and declarations of commit_tree and
commit_tree_extended to use struct object_id and adjust all usages of
these functions.

Signed-off-by: Patryk Obara <patryk.obara@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patryk Obara
2018-01-28 01:13:16 +01:00
committed by Junio C Hamano
parent 3b34934dca
commit 5078f34459
10 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
notes-merge.c
View File

@ -642,9 +642,8 @@ int notes_merge(struct notes_merge_options *o,
struct commit_list *parents = NULL;
commit_list_insert(remote, &parents); /* LIFO order */
commit_list_insert(local, &parents);
create_notes_commit(local_tree, parents,
o->commit_msg.buf, o->commit_msg.len,
result_oid->hash);
create_notes_commit(local_tree, parents, o->commit_msg.buf,
o->commit_msg.len, result_oid);
}
found_result:
@ -718,8 +717,8 @@ int notes_merge_commit(struct notes_merge_options *o,
strbuf_setlen(&path, baselen);
}
create_notes_commit(partial_tree, partial_commit->parents,
msg, strlen(msg), result_oid->hash);
create_notes_commit(partial_tree, partial_commit->parents, msg,
strlen(msg), result_oid);
unuse_commit_buffer(partial_commit, buffer);
if (o->verbosity >= 4)
printf("Finalized notes merge commit: %s\n",