Move better_branch_name above get_ref in merge-recursive.

diff --git a/cache.h b/cache.h
index 4943056c19ffb72a7cfb994daaa788ec1b01d60b..29dd290c9253bd96f086432e24d98cb0b43fa096 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -416,8 +416,8 @@ extern int check_repository_format_version(const char *var, const char *value);
 extern char git_default_email[MAX_GITNAME];
 extern char git_default_name[MAX_GITNAME];
 
-#define MAX_ENCODING_LENGTH 64
-extern char git_commit_encoding[MAX_ENCODING_LENGTH];
+extern char *git_commit_encoding;
+extern char *git_log_output_encoding;
 
 extern int copy_fd(int ifd, int ofd);
 extern void write_or_die(int fd, const void *buf, size_t count);