Merge branch 'maint-1.6.0' into maint-1.6.1

gitster · gitster · commit 2a5643da732b · 2009-03-24T15:31:15.000-07:00
* maint-1.6.0:
  close_sha1_file(): make it easier to diagnose errors
  avoid possible overflow in delta size filtering computation
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
@@ -1293,7 +1293,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 		max_size = trg_entry->delta_size;
 		ref_depth = trg->depth;
 	}
-	max_size = max_size * (max_depth - src->depth) /
+	max_size = (uint64_t)max_size * (max_depth - src->depth) /
 						(max_depth - ref_depth + 1);
 	if (max_size == 0)
 		return 0;
diff --git a/sha1_file.c b/sha1_file.c
@@ -2298,7 +2298,7 @@ static void close_sha1_file(int fd)
 		fsync_or_die(fd, "sha1 file");
 	fchmod(fd, 0444);
 	if (close(fd) != 0)
-		die("unable to write sha1 file");
+		die("error when closing sha1 file (%s)", strerror(errno));
 }
 
 /* Size of directory component, including the ending '/' */

Original file line number	Diff line number	Diff line change
`@@ -1293,7 +1293,7 @@ static int try_delta(struct unpacked trg, struct unpacked src,`
`1293`	`1293`	`max_size = trg_entry->delta_size;`
`1294`	`1294`	`ref_depth = trg->depth;`
`1295`	`1295`	`}`
`1296`		`- max_size = max_size * (max_depth - src->depth) /`
	`1296`	`+ max_size = (uint64_t)max_size * (max_depth - src->depth) /`
`1297`	`1297`	`(max_depth - ref_depth + 1);`
`1298`	`1298`	`if (max_size == 0)`
`1299`	`1299`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -2298,7 +2298,7 @@ static void close_sha1_file(int fd)`
`2298`	`2298`	`fsync_or_die(fd, "sha1 file");`
`2299`	`2299`	`fchmod(fd, 0444);`
`2300`	`2300`	`if (close(fd) != 0)`
`2301`		`- die("unable to write sha1 file");`
	`2301`	`+ die("error when closing sha1 file (%s)", strerror(errno));`
`2302`	`2302`	`}`
`2303`	`2303`
`2304`	`2304`	`/* Size of directory component, including the ending '/' */`