GIT 1.0.0b

Signed-off-by: Junio C Hamano <junkio@cox.net>
server-info: skip empty lines.
2005-12-21 13:51:51 -08:00 · 2005-12-21 13:48:47 -08:00 · 2005-12-21 13:28:24 -08:00 · 2005-12-21 13:17:54 -08:00 · 2005-12-21 13:00:31 -08:00 · 2005-12-21 12:22:43 -08:00
7 changed files with 31 additions and 8 deletions
--- a/2
+++ b/2
@ -55,7 +55,7 @@ all:
 # Define USE_STDEV below if you want git to care about the underlying device
 # change being considered an inode change from the update-cache perspective.

-GIT_VERSION = 1.0.0
+GIT_VERSION = 1.0.0b

 # CFLAGS and LDFLAGS are for the users to override from the command line.

--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,20 @@
+git-core (1.0.0b-0) unstable; urgency=low
+
+  * GIT 1.0.0b to include two more fixes.
+
+ -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 13:50:21 -0800
+
+git-core (1.0.0a-0) unstable; urgency=low
+
+  * GIT 1.0.0a to include the following fixes:
+  
+    - Avoid misleading success message on error (Johannes)
+    - objects/info/packs: work around bug in http-fetch.c::fetch_indices()
+    - http-fetch.c: fix objects/info/pack parsing.
+    - An off-by-one bug found by valgrind (Pavel)
+
+ -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 13:17:17 -0800
+
 git-core (1.0.0-0) unstable; urgency=low

  * GIT 1.0.0
--- a/http-fetch.c
+++ b/http-fetch.c
@ -658,7 +658,7 @@ static int fetch_indices(struct alt_base *repo)
 		switch (data[i]) {
 		case 'P':
 			i++;
-			if (i + 52 < buffer.posn &&
+			if (i + 52 <= buffer.posn &&
 			    !strncmp(data + i, " pack-", 6) &&
 			    !strncmp(data + i + 46, ".pack\n", 6)) {
 				get_sha1_hex(data + i + 6, sha1);
@ -667,7 +667,7 @@ static int fetch_indices(struct alt_base *repo)
 				break;
 			}
 		default:
-			while (data[i] != '\n')
+			while (i < buffer.posn && data[i] != '\n')
 				i++;
 		}
 		i++;
--- a/index-pack.c
+++ b/index-pack.c
@ -440,7 +440,7 @@ int main(int argc, char **argv)
 		if (len < 5 || strcmp(pack_name + len - 5, ".pack"))
 			die("packfile name '%s' does not end with '.pack'",
 			    pack_name);
-		index_name_buf = xmalloc(len - 1);
+		index_name_buf = xmalloc(len);
 		memcpy(index_name_buf, pack_name, len - 5);
 		strcpy(index_name_buf + len - 5, ".idx");
 		index_name = index_name_buf;
--- a/quote.c
+++ b/quote.c
@ -126,8 +126,10 @@ static int quote_c_style_counted(const char *name, int namelen,

 	if (!no_dq)
 		EMIT('"');
-	for (sp = name; (ch = *sp++) && (sp - name) <= namelen; ) {
-
+	for (sp = name; sp < name + namelen; sp++) {
+		ch = *sp;
+		if (!ch)
+			break;
 		if ((ch < ' ') || (ch == '"') || (ch == '\\') ||
 		    (ch == 0177)) {
 			needquote = 1;
--- a/send-pack.c
+++ b/send-pack.c
@ -272,7 +272,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
 	packet_flush(out);
 	if (new_refs)
 		pack_objects(out, remote_refs);
-	else
+	else if (ret == 0)
 		fprintf(stderr, "Everything up-to-date\n");
 	close(out);
 	return ret;
--- a/server-info.c
+++ b/server-info.c
@ -99,7 +99,10 @@ static int read_pack_info_file(const char *infofile)
 	while (fgets(line, sizeof(line), fp)) {
 		int len = strlen(line);
 		if (line[len-1] == '\n')
-			line[len-1] = 0;
+			line[--len] = 0;
+
+		if (!len)
+			continue;

 		switch (line[0]) {
 		case 'P': /* P name */
@ -200,6 +203,7 @@ static void write_pack_info_file(FILE *fp)
 	int i;
 	for (i = 0; i < num_pack; i++)
 		fprintf(fp, "P %s\n", info[i]->p->pack_name + objdirlen + 6);
+	fputc('\n', fp);
 }

 static int update_info_packs(int force)
Author	SHA1	Message	Date
Junio C Hamano	8d712aafd2	GIT 1.0.0b Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-12-21 13:51:51 -08:00
Junio C Hamano	8ac4838af4	server-info: skip empty lines. Now we allow an empty line in objects/info/packs file, recognize that and stop complaining. Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-12-21 13:48:47 -08:00
Pavel Roskin	50e7b06730	[PATCH] quote.c: Make loop control more readable. quote_c_style_counted() in quote.c uses a hard-to-read construct. Convert this to a more traditional form of the for loop. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-12-21 13:28:24 -08:00
Junio C Hamano	e4e79a2175	GIT 1.0.0a - Avoid misleading success message on error (Johannes) - objects/info/packs: work around bug in http-fetch.c::fetch_indices() - http-fetch.c: fix objects/info/pack parsing. - An off-by-one bug found by valgrind (Pavel) Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-12-21 13:17:54 -08:00
Pavel Roskin	6689f08735	An off-by-one bug found by valgrind Insufficient memory is allocated in index-pack.c to hold the *.idx name. One more byte should be allocated to hold the terminating 0. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-12-21 13:00:31 -08:00
Johannes Schindelin	9470657ad0	Avoid misleading success message on error When a push fails (for example when the remote head does not fast forward to the desired ref) it is not correct to print "Everything up-to-date". Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-12-21 12:22:43 -08:00
Junio C Hamano	455c161c47	http-fetch.c: fix objects/info/pack parsing. It failed to register the last pack in the objects/info/packs file. Also it had an independent overrun error. Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-12-21 12:13:53 -08:00
Junio C Hamano	21b1aced83	objects/info/packs: work around bug in http-fetch.c::fetch_indices() The code to fetch pack index files in deployed clients have a bug that causes it to ignore the pack file on the last line of objects/info/packs file, so append an empty line to work it around. Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-12-21 12:13:52 -08:00