summaryrefslogtreecommitdiff
path: root/line-log.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2016-06-24 23:09:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-28 18:39:02 (GMT)
commita0d12c4433e25e87b67df78b45635df8a098fb23 (patch)
tree4fccd5651863d2ae9aeeaeabdab57a1c7159609b /line-log.c
parentc368dde9245fa3d50b7e01e1ff4f9e5c12c718da (diff)
downloadgit-a0d12c4433e25e87b67df78b45635df8a098fb23.zip
git-a0d12c4433e25e87b67df78b45635df8a098fb23.tar.gz
git-a0d12c4433e25e87b67df78b45635df8a098fb23.tar.bz2
diff: convert struct diff_filespec to struct object_id
Convert struct diff_filespec's sha1 member to use a struct object_id called "oid" instead. The following Coccinelle semantic patch was used to implement this, followed by the transformations in object_id.cocci: @@ struct diff_filespec o; @@ - o.sha1 + o.oid.hash @@ struct diff_filespec *p; @@ - p->sha1 + p->oid.hash Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'line-log.c')
-rw-r--r--line-log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/line-log.c b/line-log.c
index bbe31ed..0293863 100644
--- a/line-log.c
+++ b/line-log.c
@@ -520,7 +520,7 @@ static void fill_line_ends(struct diff_filespec *spec, long *lines,
char *data = NULL;
if (diff_populate_filespec(spec, 0))
- die("Cannot read blob %s", sha1_to_hex(spec->sha1));
+ die("Cannot read blob %s", oid_to_hex(&spec->oid));
ALLOC_ARRAY(ends, size);
ends[cur++] = 0;