From: Michael Haggerty Date: Mon, 22 Apr 2013 19:52:13 GMT Subject: [PATCH v2 05/33] refs: define constant PEELED_LINE_LENGTH Message-ID: <1366660361-21831-6-git-send-email-mhagger@alum.mit.edu> In-Reply-To: <1366660361-21831-1-git-send-email-mhagger@alum.mit.edu> Signed-off-by: Michael Haggerty --- refs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/refs.c b/refs.c index efad658..e1e9ddd 100644 --- a/refs.c +++ b/refs.c @@ -805,6 +805,9 @@ void invalidate_ref_cache(const char *submodule) clear_loose_ref_cache(refs); } +/* The length of a peeled reference line in packed-refs, including EOL: */ +#define PEELED_LINE_LENGTH 42 + /* * Parse one line from a packed-refs file. Write the SHA1 to sha1. * Return a pointer to the refname within the line (null-terminated), @@ -897,8 +900,8 @@ static void read_packed_refs(FILE *f, struct ref_dir *dir) } if (last && refline[0] == '^' && - strlen(refline) == 42 && - refline[41] == '\n' && + strlen(refline) == PEELED_LINE_LENGTH && + refline[PEELED_LINE_LENGTH - 1] == '\n' && !get_sha1_hex(refline + 1, sha1)) { hashcpy(last->u.value.peeled, sha1); /* -- 1.8.2.1