X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=update-cache.c;h=63815ed658e9c2007938309458444b218c330d68;hb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;hp=7c2698df6e7b08315e7d20bd40c1e7e313f52bf3;hpb=0ed3715ffc97325a625e1e4ef44121d870b98679;p=git.git

diff --git a/update-cache.c b/update-cache.c
index 7c2698df..63815ed6 100644
--- a/update-cache.c
+++ b/update-cache.c
@@ -12,7 +12,7 @@
  * like "git-update-cache *" and suddenly having all the object
  * files be revision controlled.
  */
-static int allow_add = 0, allow_remove = 0, allow_replace = 0, not_new = 0, quiet = 0;
+static int allow_add = 0, allow_remove = 0, allow_replace = 0, not_new = 0, quiet = 0, info_only = 0;
 static int force_remove;
 
 /* Three functions to allow overloaded pointer return; see linux/err.h */
@@ -68,7 +68,7 @@ static int add_file_to_cache(char *path)
 		fd = open(path, O_RDONLY);
 		if (fd < 0)
 			return -1;
-		if (index_fd(ce->sha1, fd, &st) < 0)
+		if (index_fd(ce->sha1, fd, &st, !info_only, NULL) < 0)
 			return -1;
 		break;
 	case S_IFLNK:
@@ -77,7 +77,12 @@ static int add_file_to_cache(char *path)
 			free(target);
 			return -1;
 		}
-		if (write_sha1_file(target, st.st_size, "blob", ce->sha1))
+		if (info_only) {
+			unsigned char hdr[50];
+			int hdrlen;
+			write_sha1_file_prepare(target, st.st_size, "blob",
+						ce->sha1, hdr, &hdrlen);
+		} else if (write_sha1_file(target, st.st_size, "blob", ce->sha1))
 			return -1;
 		free(target);
 		break;
@@ -89,36 +94,15 @@ static int add_file_to_cache(char *path)
 	return add_cache_entry(ce, option);
 }
 
-static int match_data(int fd, void *buffer, unsigned long size)
-{
-	while (size) {
-		char compare[1024];
-		int ret = read(fd, compare, sizeof(compare));
-
-		if (ret <= 0 || ret > size || memcmp(buffer, compare, ret))
-			return -1;
-		size -= ret;
-		buffer += ret;
-	}
-	return 0;
-}
-
-static int compare_data(struct cache_entry *ce, unsigned long expected_size)
+static int compare_data(struct cache_entry *ce, struct stat *st)
 {
 	int match = -1;
 	int fd = open(ce->name, O_RDONLY);
 
 	if (fd >= 0) {
-		void *buffer;
-		unsigned long size;
-		char type[20];
-
-		buffer = read_sha1_file(ce->sha1, type, &size);
-		if (buffer) {
-			if (size == expected_size && !strcmp(type, "blob"))
-				match = match_data(fd, buffer, size);
-			free(buffer);
-		}
+		unsigned char sha1[20];
+		if (!index_fd(sha1, fd, st, 0, NULL))
+			match = memcmp(sha1, ce->sha1, 20);
 		close(fd);
 	}
 	return match;
@@ -184,7 +168,7 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce)
 
 	switch (st.st_mode & S_IFMT) {
 	case S_IFREG:
-		if (compare_data(ce, st.st_size))
+		if (compare_data(ce, &st))
 			return ERR_PTR(-EINVAL);
 		break;
 	case S_IFLNK:
@@ -337,6 +321,7 @@ int main(int argc, char **argv)
 {
 	int i, newfd, entries, has_errors = 0;
 	int allow_options = 1;
+	const char *prefix = setup_git_directory();
 
 	newfd = hold_index_file_for_update(&cache_file, get_index_file());
 	if (newfd < 0)
@@ -382,6 +367,10 @@ int main(int argc, char **argv)
 				i += 3;
 				continue;
 			}
+			if (!strcmp(path, "--info-only")) {
+				info_only = 1;
+				continue;
+			}
 			if (!strcmp(path, "--force-remove")) {
 				force_remove = 1;
 				continue;
@@ -393,6 +382,7 @@ int main(int argc, char **argv)
 			}
 			die("unknown option %s", path);
 		}
+		path = prefix_path(prefix, prefix ? strlen(prefix) : 0, path);
 		if (!verify_path(path)) {
 			fprintf(stderr, "Ignoring path %s\n", argv[i]);
 			continue;