crtxcr/cgitsb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ui-patch: replace 'unsigned char sha1[20]' with 'struct object_id oid'

Browse Source 
Upstream git is replacing 'unsigned char sha1[20]' with 'struct object_id
oid'. We have some code that can be changed independent from upstream. So
here we go...
This commit is contained in:
Christian Hesse 2016-09-29 21:51:41 +02:00
parent 1a9a75d7c7
commit 85793b8181
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui-patch.c
View File

@ -16,7 +16,7 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
{ {
struct rev_info rev; struct rev_info rev;
struct commit *commit; struct commit *commit;
unsigned char new_rev_sha1[20], old_rev_sha1[20]; struct object_id new_rev_oid, old_rev_oid;
char rev_range[2 * 40 + 3]; char rev_range[2 * 40 + 3];
char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range }; char *rev_argv[] = { NULL, "--reverse", "--format=email", rev_range };
char *patchname; char *patchname;
@ -24,12 +24,12 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
if (!new_rev) if (!new_rev)
new_rev = ctx.qry.head; new_rev = ctx.qry.head;
if (get_sha1(new_rev, new_rev_sha1)) { if (get_oid(new_rev, &new_rev_oid)) {
cgit_print_error_page(404, "Not found", cgit_print_error_page(404, "Not found",
"Bad object id: %s", new_rev); "Bad object id: %s", new_rev);
return; return;
} }
commit = lookup_commit_reference(new_rev_sha1); commit = lookup_commit_reference(new_rev_oid.hash);
if (!commit) { if (!commit) {
cgit_print_error_page(404, "Not found", cgit_print_error_page(404, "Not found",
"Bad commit reference: %s", new_rev); "Bad commit reference: %s", new_rev);
@ -37,27 +37,27 @@ void cgit_print_patch(const char *new_rev, const char *old_rev,
} }
if (old_rev) { if (old_rev) {
if (get_sha1(old_rev, old_rev_sha1)) { if (get_oid(old_rev, &old_rev_oid)) {
cgit_print_error_page(404, "Not found", cgit_print_error_page(404, "Not found",
"Bad object id: %s", old_rev); "Bad object id: %s", old_rev);
return; return;
} }
if (!lookup_commit_reference(old_rev_sha1)) { if (!lookup_commit_reference(old_rev_oid.hash)) {
cgit_print_error_page(404, "Not found", cgit_print_error_page(404, "Not found",
"Bad commit reference: %s", old_rev); "Bad commit reference: %s", old_rev);
return; return;
} }
} else if (commit->parents && commit->parents->item) { } else if (commit->parents && commit->parents->item) {
hashcpy(old_rev_sha1, commit->parents->item->object.oid.hash); oidcpy(&old_rev_oid, &commit->parents->item->object.oid);
} else { } else {
hashclr(old_rev_sha1); oidclr(&old_rev_oid);
} }
if (is_null_sha1(old_rev_sha1)) { if (is_null_oid(&old_rev_oid)) {
memcpy(rev_range, sha1_to_hex(new_rev_sha1), 41); memcpy(rev_range, oid_to_hex(&new_rev_oid), GIT_SHA1_HEXSZ + 1);
} else { } else {
sprintf(rev_range, "%s..%s", sha1_to_hex(old_rev_sha1), sprintf(rev_range, "%s..%s", oid_to_hex(&old_rev_oid),
sha1_to_hex(new_rev_sha1)); oid_to_hex(&new_rev_oid));
} }
patchname = fmt("%s.patch", rev_range); patchname = fmt("%s.patch", rev_range);