summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-05-30 17:30:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-02 00:36:07 (GMT)
commitf9704c2d823f437aeed50e591415f24aebdda71d (patch)
tree94054d09457dcfb830b08bd16dc9246af9b369ff /builtin
parent94a0097a41f09e00322add6d1cf62b3610b6a85c (diff)
downloadgit-f9704c2d823f437aeed50e591415f24aebdda71d.zip
git-f9704c2d823f437aeed50e591415f24aebdda71d.tar.gz
git-f9704c2d823f437aeed50e591415f24aebdda71d.tar.bz2
diff: convert fill_filespec to struct object_id
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/blame.c2
-rw-r--r--builtin/diff.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 1043e53..5ad4353 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -163,7 +163,7 @@ int textconv_object(const char *path,
struct userdiff_driver *textconv;
df = alloc_filespec(path);
- fill_filespec(df, oid->hash, oid_valid, mode);
+ fill_filespec(df, oid, oid_valid, mode);
textconv = get_textconv(df);
if (!textconv) {
free_filespec(df);
diff --git a/builtin/diff.c b/builtin/diff.c
index 8c03dda..b2d7c32 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -57,8 +57,8 @@ static void stuff_change(struct diff_options *opt,
one = alloc_filespec(old_name);
two = alloc_filespec(new_name);
- fill_filespec(one, old_oid->hash, old_oid_valid, old_mode);
- fill_filespec(two, new_oid->hash, new_oid_valid, new_mode);
+ fill_filespec(one, old_oid, old_oid_valid, old_mode);
+ fill_filespec(two, new_oid, new_oid_valid, new_mode);
diff_queue(&diff_queued_diff, one, two);
}