diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2017-11-12 21:28:54 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-11-13 13:20:44 +0900 |
| commit | eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4 (patch) | |
| tree | 9042f094bd1f12d1249d714fdd177fcbe4fbf2a4 /builtin/checkout.c | |
| parent | Integrate hash algorithm support with repo setup (diff) | |
| download | tgif-eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4.tar.xz | |
Switch empty tree and blob lookups to use hash abstraction
Switch the uses of empty_tree_oid and empty_blob_oid to use the
current_hash abstraction that represents the current hash algorithm in
use.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 6c2b4cd419..2b64805f35 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -514,7 +514,7 @@ static int merge_working_tree(const struct checkout_opts *opts, } tree = parse_tree_indirect(old->commit ? &old->commit->object.oid : - &empty_tree_oid); + the_hash_algo->empty_tree); init_tree_desc(&trees[0], tree->buffer, tree->size); tree = parse_tree_indirect(&new->commit->object.oid); init_tree_desc(&trees[1], tree->buffer, tree->size); |