Merge branch 'jk/difftool-in-subdir' into maint

diff --git a/t/helper/test-submodule-config.c b/t/helper/test-submodule-config.c
index 2a50217bf5957733f6920260d1b4ad8abf69fd57..2f144d539a4822619a9383ded2d3adb270484624 100644 (file)
--- a/t/helper/test-submodule-config.c
+++ b/t/helper/test-submodule-config.c
@@ -49,7 +49,7 @@ int cmd_main(int argc, const 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.");