aboutsummaryrefslogtreecommitdiffstats
path: root/ui-diff.c
diff options
context:
space:
mode:
Diffstat (limited to 'ui-diff.c')
-rw-r--r--ui-diff.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui-diff.c b/ui-diff.c
index a10ce8a..e33e9fb 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -258,8 +258,8 @@ static void header(const struct object_id *oid1, char *path1, int mode1,
258 htmlf("<br/>deleted file mode %.6o", mode1); 258 htmlf("<br/>deleted file mode %.6o", mode1);
259 259
260 if (!subproject) { 260 if (!subproject) {
261 abbrev1 = xstrdup(find_unique_abbrev(oid1->hash, DEFAULT_ABBREV)); 261 abbrev1 = xstrdup(find_unique_abbrev(oid1, DEFAULT_ABBREV));
262 abbrev2 = xstrdup(find_unique_abbrev(oid2->hash, DEFAULT_ABBREV)); 262 abbrev2 = xstrdup(find_unique_abbrev(oid2, DEFAULT_ABBREV));
263 htmlf("<br/>index %s..%s", abbrev1, abbrev2); 263 htmlf("<br/>index %s..%s", abbrev1, abbrev2);
264 free(abbrev1); 264 free(abbrev1);
265 free(abbrev2); 265 free(abbrev2);
@@ -413,7 +413,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
413 "Bad commit: %s", oid_to_hex(new_rev_oid)); 413 "Bad commit: %s", oid_to_hex(new_rev_oid));
414 return; 414 return;
415 } 415 }
416 new_tree_oid = &commit->tree->object.oid; 416 new_tree_oid = &commit->maybe_tree->object.oid;
417 417
418 if (old_rev) { 418 if (old_rev) {
419 if (get_oid(old_rev, old_rev_oid)) { 419 if (get_oid(old_rev, old_rev_oid)) {
@@ -434,7 +434,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
434 "Bad commit: %s", oid_to_hex(old_rev_oid)); 434 "Bad commit: %s", oid_to_hex(old_rev_oid));
435 return; 435 return;
436 } 436 }
437 old_tree_oid = &commit2->tree->object.oid; 437 old_tree_oid = &commit2->maybe_tree->object.oid;
438 } else { 438 } else {
439 old_tree_oid = NULL; 439 old_tree_oid = NULL;
440 } 440 }