X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=read-tree.c;h=aa6172b52eeadb4f118e5145c182270342a70bf0;hb=aedb8995f841949ce29e05ea7e5c03c2d5466089;hp=5d304641067779b2c630a616279937378fe60c2c;hpb=b0121fb3f279a9cf13aff9da060e742aef3a83fa;p=git.git

diff --git a/read-tree.c b/read-tree.c
index 5d3046410..aa6172b52 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -13,6 +13,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;
@@ -419,6 +420,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);
@@ -720,9 +725,15 @@ static int oneway_merge(struct cache_entry **src)
 
 	if (!a) {
 		invalidate_ce_path(old);
-		return 0;
+		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);
@@ -790,7 +801,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;
 
@@ -880,8 +891,8 @@ int main(int argc, char **argv)
 		if (1 < index_only + update)
 			usage(read_tree_usage);
 
-		if (get_sha1(arg, sha1) < 0)
-			usage(read_tree_usage);
+		if (get_sha1(arg, sha1))
+			die("Not a valid object name %s", arg);
 		if (list_tree(sha1) < 0)
 			die("failed to unpack tree object %s", arg);
 		stage++;