Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
builtin/reset: convert use of EMPTY_TREE_SHA1_BIN
author
brian m. carlson
<sandals@crustytoothpaste.net>
Wed, 2 May 2018 00:26:02 +0000
(
00:26
+0000)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 2 May 2018 04:59:52 +0000
(13:59 +0900)
Convert the last use of EMPTY_TREE_SHA1_BIN to use a direct copy from
the_hash_algo->empty_tree to avoid a dependency on a given hash
algorithm.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/reset.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
c00866a
)
diff --git
a/builtin/reset.c
b/builtin/reset.c
index 7f1c3f02a302128d6c00c35b8783c1a62353b37a..a862c70fab99290b5faf3e700e88194589583329 100644
(file)
--- a/
builtin/reset.c
+++ b/
builtin/reset.c
@@
-314,7
+314,7
@@
int cmd_reset(int argc, const char **argv, const char *prefix)
unborn = !strcmp(rev, "HEAD") && get_oid("HEAD", &oid);
if (unborn) {
/* reset on unborn branch: treat as reset to empty tree */
-
hashcpy(oid.hash, EMPTY_TREE_SHA1_BIN
);
+
oidcpy(&oid, the_hash_algo->empty_tree
);
} else if (!pathspec.nr) {
struct commit *commit;
if (get_oid_committish(rev, &oid))