Merge branch 'ew/email' into next

[git.git] / read-tree.c

diff --git a/read-tree.c b/read-tree.c
index be29b3f..eaff444 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -337,7 +337,7 @@ static void check_updates(struct cache_entry **src, int nr)
                if (ce->ce_flags & mask) {
                        ce->ce_flags &= ~mask;
                        if (update)
-                               checkout_entry(ce, &state);
+                               checkout_entry(ce, &state, NULL);
                }
        }
        if (total) {
@@ -717,6 +717,7 @@ int main(int argc, char **argv)
        merge_fn_t fn = NULL;
 
        setup_git_directory();
+       git_config(git_default_config);
 
        newfd = hold_index_file_for_update(&cache_file, get_index_file());
        if (newfd < 0)