diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-06 22:10:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 15:12:58 +0900 |
| commit | 944cffbd18a7dbe0b4c5849da6f093c41b49ea00 (patch) | |
| tree | 2f772ea511efebff44244c955345182ce2dfedd1 /builtin/reset.c | |
| parent | a9b5f5bfd50bfd0a96e464ccf926092ffe03163a (diff) | |
| download | git-944cffbd18a7dbe0b4c5849da6f093c41b49ea00.tar.gz | |
diff-lib: convert do_diff_cache to struct object_id
This is needed to convert parse_tree_indirect.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/reset.c')
| -rw-r--r-- | builtin/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index 0be52fa36a..3415dac5d5 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -154,7 +154,7 @@ static int read_from_tree(const struct pathspec *pathspec, opt.format_callback = update_index_from_diff; opt.format_callback_data = &intent_to_add; - if (do_diff_cache(tree_oid->hash, &opt)) + if (do_diff_cache(tree_oid, &opt)) return 1; diffcore_std(&opt); diff_flush(&opt); |