Merge branch 'ph/checkout'

diff --git a/builtin-merge.c b/builtin-merge.c
index 0fd7985a112231ba164ed3ba408519d6ce732071..e78fa18b3a68e2b7f041beab0524ce1a2b7e9365 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -431,7 +431,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
                sha1_to_hex(remote_head->sha1), remote);
 }
 
-int git_merge_config(const char *k, const char *v, void *cb)
+static int git_merge_config(const char *k, const char *v, void *cb)
 {
        if (branch && !prefixcmp(k, "branch.") &&
                !prefixcmp(k + 7, branch) &&
@@ -572,6 +572,7 @@ static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
        memset(&trees, 0, sizeof(trees));
        memset(&opts, 0, sizeof(opts));
        memset(&t, 0, sizeof(t));
+       memset(&dir, 0, sizeof(dir));
        dir.show_ignored = 1;
        dir.exclude_per_dir = ".gitignore";
        opts.dir = &dir;