diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-03-12 02:27:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-14 09:23:47 -0700 |
| commit | df46d77e00e7bbcfe46cc06c071fa5284f96c327 (patch) | |
| tree | 01b7e694bd31454103afc694559dc7a34967b899 /merge-recursive.c | |
| parent | resolve-undo: convert struct resolve_undo_info to object_id (diff) | |
| download | git-df46d77e00e7bbcfe46cc06c071fa5284f96c327.tar.gz git-df46d77e00e7bbcfe46cc06c071fa5284f96c327.zip | |
tree: convert read_tree_recursive to struct object_id
Convert the callback functions for read_tree_recursive to take a pointer
to struct object_id.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 6ff971f9a2..c886f2e9cd 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -335,7 +335,7 @@ struct tree *write_tree_from_memory(struct merge_options *o) return result; } -static int save_files_dirs(const unsigned char *sha1, +static int save_files_dirs(const struct object_id *oid, struct strbuf *base, const char *path, unsigned int mode, int stage, void *context) { |