summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorLibravatar Brandon Williams <bmwill@google.com>2017-05-30 10:30:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-02 09:36:07 +0900
commitc26022ea8f54649ed6b3b545dd3158907abe5d2c (patch)
treea774987137bafa841a9eed9ce3248ef83a8167e0 /diff.h
parentdiff: convert diff_index_show_file to struct object_id (diff)
downloadtgif-c26022ea8f54649ed6b3b545dd3158907abe5d2c.tar.xz
diff: convert diff_addremove to struct object_id
Convert diff_addremove to take a struct object_id. In addtion convert the function pointer type 'add_remove_fn_t' to also take a struct object_id. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/diff.h b/diff.h
index d75e6d15e2..1086975a5a 100644
--- a/diff.h
+++ b/diff.h
@@ -31,8 +31,8 @@ typedef void (*change_fn_t)(struct diff_options *options,
typedef void (*add_remove_fn_t)(struct diff_options *options,
int addremove, unsigned mode,
- const unsigned char *sha1,
- int sha1_valid,
+ const struct object_id *oid,
+ int oid_valid,
const char *fullpath, unsigned dirty_submodule);
typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
@@ -247,8 +247,8 @@ extern int diff_can_quit_early(struct diff_options *);
extern void diff_addremove(struct diff_options *,
int addremove,
unsigned mode,
- const unsigned char *sha1,
- int sha1_valid,
+ const struct object_id *oid,
+ int oid_valid,
const char *fullpath, unsigned dirty_submodule);
extern void diff_change(struct diff_options *,