diff options
| -rw-r--r-- | builtin/merge.c | 2 | ||||
| -rw-r--r-- | builtin/unpack-objects.c | 4 | ||||
| -rw-r--r-- | diff.c | 2 | ||||
| -rw-r--r-- | submodule-config.c | 2 | ||||
| -rw-r--r-- | t/helper/test-submodule-config.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index b555a1bf9c..a9b99c9ffc 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1530,7 +1530,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) * Stash away the local changes so that we can try more than one. */ save_state(stash)) - hashcpy(stash, null_sha1); + hashclr(stash); for (i = 0; i < use_strategies_nr; i++) { int ret; diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c index 875e7ed998..172470bf24 100644 --- a/builtin/unpack-objects.c +++ b/builtin/unpack-objects.c @@ -355,7 +355,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size, return; /* we are done */ else { /* cannot resolve yet --- queue it */ - hashcpy(obj_list[nr].sha1, null_sha1); + hashclr(obj_list[nr].sha1); add_delta_to_list(nr, base_sha1, 0, delta_data, delta_size); return; } @@ -406,7 +406,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size, * The delta base object is itself a delta that * has not been resolved yet. */ - hashcpy(obj_list[nr].sha1, null_sha1); + hashclr(obj_list[nr].sha1); add_delta_to_list(nr, null_sha1, base_offset, delta_data, delta_size); return; } @@ -3134,7 +3134,7 @@ static void diff_fill_sha1_info(struct diff_filespec *one) if (!one->sha1_valid) { struct stat st; if (one->is_stdin) { - hashcpy(one->sha1, null_sha1); + hashclr(one->sha1); return; } if (lstat(one->path, &st) < 0) diff --git a/submodule-config.c b/submodule-config.c index debab294d4..a6c2710f91 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -368,7 +368,7 @@ static int gitmodule_sha1_from_commit(const unsigned char *commit_sha1, int ret = 0; if (is_null_sha1(commit_sha1)) { - hashcpy(gitmodules_sha1, null_sha1); + hashclr(gitmodules_sha1); return 1; } diff --git a/t/helper/test-submodule-config.c b/t/helper/test-submodule-config.c index dab8c27768..7922ffba1d 100644 --- a/t/helper/test-submodule-config.c +++ b/t/helper/test-submodule-config.c @@ -49,7 +49,7 @@ int main(int argc, char **argv) path_or_name = arg[1]; if (commit[0] == '\0') - hashcpy(commit_sha1, null_sha1); + hashclr(commit_sha1); else if (get_sha1(commit, commit_sha1) < 0) die_usage(argc, argv, "Commit not found."); |