submodule: convert several uses of EMPTY_TREE_SHA1_HEX
Convert several uses of EMPTY_TREE_SHA1_HEX to use empty_tree_oid_hex 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>
brian m. carlson committed
May 2, 2018 at 00:25 UTC
939b89a0832810981da1f0a696d36d89c16c36bd
1 file changed
+3
-3
submodule.c
+3
-3
@@ -1567,7 +1567,7 @@ static void submodule_reset_index(const char *path)
1567
get_super_prefix_or_empty(), path);
1568
argv_array_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
1569
1570
- argv_array_push(&cp.args, EMPTY_TREE_SHA1_HEX);
1570
+ argv_array_push(&cp.args, empty_tree_oid_hex());
1571
1572
if (run_command(&cp))
1573
die("could not reset submodule index");
@@ -1659,9 +1659,9 @@ int submodule_move_head(const char *path,
1659
argv_array_push(&cp.args, "-m");
1660
1661
if (!(flags & SUBMODULE_MOVE_HEAD_FORCE))
1662
- argv_array_push(&cp.args, old_head ? old_head : EMPTY_TREE_SHA1_HEX);
1662
+ argv_array_push(&cp.args, old_head ? old_head : empty_tree_oid_hex());
1663
1664
- argv_array_push(&cp.args, new_head ? new_head : EMPTY_TREE_SHA1_HEX);
1664
+ argv_array_push(&cp.args, new_head ? new_head : empty_tree_oid_hex());
1665
1666
if (run_command(&cp)) {
1667
ret = -1;