diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-23 13:16:40 -0800 |
| commit | 537e1064223181f5811649497c12b98b8319c0d2 (patch) | |
| tree | d2ec35e9d99ceed02a857fe247de127200f51588 | |
| parent | Merge branch 'tg/stash-with-pathspec-fix' (diff) | |
| parent | bisect: debug: convert struct object to object_id (diff) | |
| download | tgif-537e1064223181f5811649497c12b98b8319c0d2.tar.xz | |
Merge branch 'ys/bisect-object-id-missing-conversion-fix'
Fix for a commented-out code to adjust it to a rather old API change.
* ys/bisect-object-id-missing-conversion-fix:
bisect: debug: convert struct object to object_id
| -rw-r--r-- | bisect.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -132,7 +132,7 @@ static void show_list(const char *debug, int counted, int nr, unsigned flags = commit->object.flags; enum object_type type; unsigned long size; - char *buf = read_sha1_file(commit->object.sha1, &type, &size); + char *buf = read_sha1_file(commit->object.oid.hash, &type, &size); const char *subject_start; int subject_len; @@ -144,10 +144,10 @@ static void show_list(const char *debug, int counted, int nr, fprintf(stderr, "%3d", weight(p)); else fprintf(stderr, "---"); - fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.sha1)); + fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.oid.hash)); for (pp = commit->parents; pp; pp = pp->next) fprintf(stderr, " %.*s", 8, - sha1_to_hex(pp->item->object.sha1)); + sha1_to_hex(pp->item->object.oid.hash)); subject_len = find_commit_subject(buf, &subject_start); if (subject_len) |