Add missing includes and forward declarations

diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index 3b0961006385dd9b011d9795ba8b9db7d4afe7f0..9b2f707c291cf903b9151c2f3673b6fe0e0ca6d5 100644 (file)
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -9,10 +9,10 @@ static const char builtin_merge_recursive_usage[] =
 
 static const char *better_branch_name(const char *branch)
 {
-       static char githead_env[8 + GIT_SHA1_HEXSZ + 1];
+       static char githead_env[8 + GIT_MAX_HEXSZ + 1];
        char *name;
 
-       if (strlen(branch) != GIT_SHA1_HEXSZ)
+       if (strlen(branch) != the_hash_algo->hexsz)
                return branch;
        xsnprintf(githead_env, sizeof(githead_env), "GITHEAD_%s", branch);
        name = getenv(githead_env);
@@ -74,7 +74,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
        o.branch2 = better_branch_name(o.branch2);
 
        if (o.verbosity >= 3)
-               printf("Merging %s with %s\n", o.branch1, o.branch2);
+               printf(_("Merging %s with %s\n"), o.branch1, o.branch2);
 
        failed = merge_recursive_generic(&o, &h1, &h2, bases_count, bases, &result);
        if (failed < 0)