diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2019-08-18 20:04:20 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-19 15:04:59 -0700 |
| commit | 8d4d86b0f0a875e7916d7de083a88d7f11251406 (patch) | |
| tree | 1b99e2d667ac3845e60f32e69862eed1a9b38ec6 /builtin | |
| parent | builtin/worktree: switch null_sha1 to null_oid (diff) | |
| download | tgif-8d4d86b0f0a875e7916d7de083a88d7f11251406.tar.xz | |
cache: remove null_sha1
All of the existing uses of null_sha1 can be converted into uses of
null_oid, so do so. Remove null_sha1 and is_null_sha1, and define
is_null_oid in terms of null_oid. This also has the additional benefit
of removing several uses of sha1_to_hex.
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/clone.c | 2 | ||||
| -rw-r--r-- | builtin/submodule--helper.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index f665b28ccc..eabd02846a 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -785,7 +785,7 @@ static int checkout(int submodule_progress) if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) die(_("unable to write new index file")); - err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1), + err |= run_hook_le(NULL, "post-checkout", oid_to_hex(&null_oid), oid_to_hex(&oid), "1", NULL); if (!err && (option_recurse_submodules.nr > 0)) { diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 909e77e802..8a6f2abce4 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -424,7 +424,7 @@ static int module_list(int argc, const char **argv, const char *prefix) const struct cache_entry *ce = list.entries[i]; if (ce_stage(ce)) - printf("%06o %s U\t", ce->ce_mode, sha1_to_hex(null_sha1)); + printf("%06o %s U\t", ce->ce_mode, oid_to_hex(&null_oid)); else printf("%06o %s %d\t", ce->ce_mode, oid_to_hex(&ce->oid), ce_stage(ce)); |