From: Shawn Pearce Date: Wed, 17 May 2006 22:34:48 +0000 (-0400) Subject: Fix ref log parsing so it works properly. X-Git-Tag: v1.4.0-rc1~11^2~15 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=70e34b2dc88e28f09903b85932ea679992da62ff;p=git.git Fix ref log parsing so it works properly. The log parser was only ever matching the last log record due to calling strtoul on "> 1136091609" rather than " 1136091609". Also once a match for '@' has been found after the name of the ref there is no point in looking for another '@' within the remaining text. Signed-off-by: Junio C Hamano --- diff --git a/refs.c b/refs.c index 4c99e372..ae9825de 100644 --- a/refs.c +++ b/refs.c @@ -459,7 +459,7 @@ int read_ref_at(const char *ref, unsigned long at_time, unsigned char *sha1) c++; if (c == logend || *c == '\n') die("Log %s is corrupt.", logfile); - date = strtoul(c, NULL, 10); + date = strtoul(c + 1, NULL, 10); if (date <= at_time) { if (get_sha1_hex(rec + 41, sha1)) die("Log %s is corrupt.", logfile); diff --git a/sha1_name.c b/sha1_name.c index 3ac3ab4f..4376cb39 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -267,6 +267,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1) at_time = approxidate(date_spec); free(date_spec); len = at_mark; + break; } }