X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=read-tree.c;h=e16e91b173163f2b514e965d5e5ba7b939ffa1de;hb=c22a7f0fb96d5c742581422452d3d68139b79ad6;hp=11157f42426d7f1783420e1a5fa72379ee759e6a;hpb=76b99b81613abea4cc16e45e1b11dbbec82a4b4d;p=git.git

diff --git a/read-tree.c b/read-tree.c
index 11157f42..e16e91b1 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -12,6 +12,7 @@
 #include <sys/time.h>
 #include <signal.h>
 
+static int reset = 0;
 static int merge = 0;
 static int update = 0;
 static int index_only = 0;
@@ -416,6 +417,10 @@ static void verify_uptodate(struct cache_entry *ce)
 			return;
 		errno = 0;
 	}
+	if (reset) {
+		ce->ce_flags |= htons(CE_UPDATE);
+		return;
+	}
 	if (errno == ENOENT)
 		return;
 	die("Entry '%s' not uptodate. Cannot merge.", ce->name);
@@ -686,6 +691,12 @@ static int oneway_merge(struct cache_entry **src)
 	if (!a)
 		return deleted_entry(old, NULL);
 	if (old && same(old, a)) {
+		if (reset) {
+			struct stat st;
+			if (lstat(old->name, &st) ||
+			    ce_match_stat(old, &st, 1))
+				old->ce_flags |= htons(CE_UPDATE);
+		}
 		return keep_entry(old);
 	}
 	return merged_entry(a, NULL);
@@ -719,7 +730,7 @@ static struct cache_file cache_file;
 
 int main(int argc, char **argv)
 {
-	int i, newfd, reset, stage = 0;
+	int i, newfd, stage = 0;
 	unsigned char sha1[20];
 	merge_fn_t fn = NULL;