X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=read-tree.c;h=f39fe5ca653db7a4972cf99e790991c3d88495d0;hb=6ecc321ba5d8f89a8dd0a9a11d264d03ab624dc1;hp=4e0cdda08d46f174cad07baa771844494ce32936;hpb=744633cbf23d3ed505f96ffc212b30c96b79fb90;p=git.git

diff --git a/read-tree.c b/read-tree.c
index 4e0cdda0..f39fe5ca 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -404,7 +404,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;
@@ -619,7 +619,7 @@ static int twoway_merge(struct cache_entry **src)
 	struct cache_entry *oldtree = src[1], *newtree = src[2];
 
 	if (merge_size != 2)
-		return error("Cannot do a twoway merge of %d trees\n",
+		return error("Cannot do a twoway merge of %d trees",
 			     merge_size);
 
 	if (current) {
@@ -671,7 +671,7 @@ static int oneway_merge(struct cache_entry **src)
 	struct cache_entry *a = src[1];
 
 	if (merge_size != 1)
-		return error("Cannot do a oneway merge of %d trees\n",
+		return error("Cannot do a oneway merge of %d trees",
 			     merge_size);
 
 	if (!a)