crtxcr
/
cgitsb
1
0
Fork 0
Código Incidencias Pull Requests Lanzamientos Wiki Actividad

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

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...
Este commit está contenido en:
Christian Hesse 2016-09-29 21:41:09 +02:00
padre 6e4b7b6776
commit 3a0fd5e6b8
Se han modificado 1 ficheros con 4 adiciones y 4 borrados
Mostrar estadísticas Descargar archivo de parche Descargar archivo de diferencias Expandir todos los archivos Contraer todos los archivos

8
ui-commit.c
Ver fichero

@ -19,19 +19,19 @@ void cgit_print_commit(char *hex, const char *prefix)
struct commitinfo *info, *parent_info; struct commitinfo *info, *parent_info;
struct commit_list *p; struct commit_list *p;
struct strbuf notes = STRBUF_INIT; struct strbuf notes = STRBUF_INIT;
unsigned char sha1[20]; struct object_id oid;
char *tmp, *tmp2; char *tmp, *tmp2;
int parents = 0; int parents = 0;
if (!hex) if (!hex)
hex = ctx.qry.head; hex = ctx.qry.head;
if (get_sha1(hex, sha1)) { if (get_oid(hex, &oid)) {
cgit_print_error_page(400, "Bad request", cgit_print_error_page(400, "Bad request",
"Bad object id: %s", hex); "Bad object id: %s", hex);
return; return;
} }
commit = lookup_commit_reference(sha1); commit = lookup_commit_reference(oid.hash);
if (!commit) { if (!commit) {
cgit_print_error_page(404, "Not found", cgit_print_error_page(404, "Not found",
"Bad commit reference: %s", hex); "Bad commit reference: %s", hex);
@ -39,7 +39,7 @@ void cgit_print_commit(char *hex, const char *prefix)
} }
info = cgit_parse_commit(commit); info = cgit_parse_commit(commit);
format_display_notes(sha1, &notes, PAGE_ENCODING, 0); format_display_notes(oid.hash, &notes, PAGE_ENCODING, 0);
load_ref_decorations(DECORATE_FULL_REFS); load_ref_decorations(DECORATE_FULL_REFS);