diff options
author | Junio C Hamano <junkio@cox.net> | 2005-12-21 13:51:51 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-12-21 13:51:51 -0800 |
commit | 8d712aafd2df3c1f5147a28947f98cefe667cf76 (patch) | |
tree | 66844d5d813bed6ce4f83e461d871defb658125c | |
parent | e4e79a217576d24ef4d73b620766f62b155bcd98 (diff) | |
parent | 8ac4838af428a2a32498b3e8d13295eb714654b4 (diff) | |
download | git-8d712aafd2df3c1f5147a28947f98cefe667cf76.tar.gz git-8d712aafd2df3c1f5147a28947f98cefe667cf76.tar.xz |
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | quote.c | 6 | ||||
-rw-r--r-- | server-info.c | 5 |
4 files changed, 15 insertions, 4 deletions
@@ -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.0a +GIT_VERSION = 1.0.0b # CFLAGS and LDFLAGS are for the users to override from the command line. diff --git a/debian/changelog b/debian/changelog index adebba50b..8dc86c55c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +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: @@ -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; diff --git a/server-info.c b/server-info.c index 608976594..05bce7da3 100644 --- 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 */ |