X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=read-tree.c;h=4422dbf424a5f4fd491811648acd3273aba529f3;hb=b411fda15df4897a1308bbb5950088ea6138cbad;hp=32fb6faa1cfeecd2c1d67685cc2de8a52b447aed;hpb=72fdfb50f721460e4cdff16fbe9c72d4ce6c668c;p=git.git

diff --git a/read-tree.c b/read-tree.c
index 32fb6faa..4422dbf4 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -347,7 +347,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) {
@@ -414,7 +414,7 @@ static void verify_uptodate(struct cache_entry *ce)
 		return;
 
 	if (!lstat(ce->name, &st)) {
-		unsigned changed = ce_match_stat(ce, &st);
+		unsigned changed = ce_match_stat(ce, &st, 1);
 		if (!changed)
 			return;
 		errno = 0;
@@ -716,7 +716,7 @@ static int read_cache_unmerged(void)
 	return deleted;
 }
 
-static const char read_tree_usage[] = "git-read-tree (<sha> | -m [-u | -i] <sha1> [<sha2> [<sha3>]])";
+static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])";
 
 static struct cache_file cache_file;
 
@@ -727,6 +727,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)