diff options
author | Florian Pritz <bluewind@xinu.at> | 2018-08-03 17:52:44 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2018-08-03 17:52:44 +0200 |
commit | 42f8840323a219d3eca59a7a2a388c3a28eeb8fb (patch) | |
tree | ec799ab66ed4119b68268192ea8fbe62a96b51aa /ui-diff.c | |
parent | 343a8b8ee33f9a181e662fc0e3a3979dd9b52dd4 (diff) | |
parent | 824138e59194acaf5efe53690d4ef6eaf38e1549 (diff) | |
download | cgit-42f8840323a219d3eca59a7a2a388c3a28eeb8fb.tar.gz cgit-42f8840323a219d3eca59a7a2a388c3a28eeb8fb.tar.xz |
Merge branch 'master' of https://git.zx2c4.com/cgit into local
Diffstat (limited to 'ui-diff.c')
-rw-r--r-- | ui-diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -258,8 +258,8 @@ static void header(const struct object_id *oid1, char *path1, int mode1, htmlf("<br/>deleted file mode %.6o", mode1); if (!subproject) { - abbrev1 = xstrdup(find_unique_abbrev(oid1->hash, DEFAULT_ABBREV)); - abbrev2 = xstrdup(find_unique_abbrev(oid2->hash, DEFAULT_ABBREV)); + abbrev1 = xstrdup(find_unique_abbrev(oid1, DEFAULT_ABBREV)); + abbrev2 = xstrdup(find_unique_abbrev(oid2, DEFAULT_ABBREV)); htmlf("<br/>index %s..%s", abbrev1, abbrev2); free(abbrev1); free(abbrev2); @@ -413,7 +413,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, "Bad commit: %s", oid_to_hex(new_rev_oid)); return; } - new_tree_oid = &commit->tree->object.oid; + new_tree_oid = &commit->maybe_tree->object.oid; if (old_rev) { if (get_oid(old_rev, old_rev_oid)) { @@ -434,7 +434,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, "Bad commit: %s", oid_to_hex(old_rev_oid)); return; } - old_tree_oid = &commit2->tree->object.oid; + old_tree_oid = &commit2->maybe_tree->object.oid; } else { old_tree_oid = NULL; } |