From: Junio C Hamano <junkio@cox.net>
Date: Mon, 30 Jan 2006 01:55:20 +0000 (-0800)
Subject: GIT 1.1.6
X-Git-Tag: v1.1.6^0
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8fedb83c05d4b3d877a220d614e8b9d40f02709d?hp=f0fff36e82bc8cc12be58a0585106ee720c4dc98

GIT 1.1.6
---

diff --git a/entry.c b/entry.c
index 410b758aab..6c47c3a3e1 100644
--- a/entry.c
+++ b/entry.c
@@ -70,7 +70,6 @@ static int write_entry(struct cache_entry *ce, const char *path, struct checkout
 	unsigned long size;
 	long wrote;
 	char type[20];
-	char target[1024];
 
 	new = read_sha1_file(ce->sha1, type, &size);
 	if (!new || strcmp(type, "blob")) {
@@ -94,12 +93,10 @@ static int write_entry(struct cache_entry *ce, const char *path, struct checkout
 			return error("git-checkout-index: unable to write file %s", path);
 		break;
 	case S_IFLNK:
-		memcpy(target, new, size);
-		target[size] = '\0';
-		if (symlink(target, path)) {
+		if (symlink(new, path)) {
 			free(new);
-			return error("git-checkout-index: unable to create symlink %s (%s)",
-				path, strerror(errno));
+			return error("git-checkout-index: unable to create "
+				     "symlink %s (%s)", path, strerror(errno));
 		}
 		free(new);
 		break;
diff --git a/fetch-pack.c b/fetch-pack.c
index d34f322477..27f5d2a5ff 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -262,9 +262,6 @@ static void filter_refs(struct ref **refs, int nr_match, char **match)
 {
 	struct ref *prev, *current, *next;
 
-	if (!nr_match)
-		return;
-
 	for (prev = NULL, current = *refs; current; current = next) {
 		next = current->next;
 		if ((!memcmp(current->name, "refs/", 5) &&
diff --git a/sha1_file.c b/sha1_file.c
index 8bebbb255f..20f6419bde 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -349,16 +349,12 @@ struct packed_git *packed_git;
 static int check_packed_git_idx(const char *path, unsigned long *idx_size_,
 				void **idx_map_)
 {
-	SHA_CTX ctx;
-	unsigned char sha1[20];
 	void *idx_map;
 	unsigned int *index;
 	unsigned long idx_size;
 	int nr, i;
-	int fd;
+	int fd = open(path, O_RDONLY);
 	struct stat st;
-
-	fd = open(path, O_RDONLY);
 	if (fd < 0)
 		return -1;
 	if (fstat(fd, &st)) {
@@ -396,16 +392,6 @@ static int check_packed_git_idx(const char *path, unsigned long *idx_size_,
 	if (idx_size != 4*256 + nr * 24 + 20 + 20)
 		return error("wrong index file size");
 
-	/*
-	 * File checksum.
-	 */
-	SHA1_Init(&ctx);
-	SHA1_Update(&ctx, idx_map, idx_size-20);
-	SHA1_Final(sha1, &ctx);
-
-	if (memcmp(sha1, idx_map + idx_size - 20, 20))
-		return error("index checksum mismatch");
-
 	return 0;
 }