diff options
author | 2018-03-12 02:27:22 +0000 | |
---|---|---|
committer | 2018-03-14 09:23:47 -0700 | |
commit | 38b471fae0f2b961259201278b24b11262dc7596 (patch) | |
tree | 84b5affe99807bc7643070ec28fefeac0a7a262d /builtin | |
parent | bulk-checkin: convert index_bulk_checkin to struct object_id (diff) | |
download | tgif-38b471fae0f2b961259201278b24b11262dc7596.tar.xz |
builtin/write-tree: convert to struct object_id
This is needed to convert parts of the cache-tree code.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/write-tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/write-tree.c b/builtin/write-tree.c index bd0a78aa3c..299a121531 100644 --- a/builtin/write-tree.c +++ b/builtin/write-tree.c @@ -19,7 +19,7 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix) { int flags = 0, ret; const char *prefix = NULL; - unsigned char sha1[20]; + struct object_id oid; const char *me = "git-write-tree"; struct option write_tree_options[] = { OPT_BIT(0, "missing-ok", &flags, N_("allow missing objects"), @@ -38,10 +38,10 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix) argc = parse_options(argc, argv, unused_prefix, write_tree_options, write_tree_usage, 0); - ret = write_cache_as_tree(sha1, flags, prefix); + ret = write_cache_as_tree(oid.hash, flags, prefix); switch (ret) { case 0: - printf("%s\n", sha1_to_hex(sha1)); + printf("%s\n", oid_to_hex(&oid)); break; case WRITE_TREE_UNREADABLE_INDEX: die("%s: error reading the index", me); |