From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Haggerty Subject: [PATCH 5/6] Store the submodule name in struct cached_refs. Date: Sat, 13 Aug 2011 00:36:28 +0200 Message-ID: <1313188589-2330-6-git-send-email-mhagger@alum.mit.edu> References: <1313188589-2330-1-git-send-email-mhagger@alum.mit.edu> Cc: Junio C Hamano , Jeff King , Drew Northup , Jakub Narebski , Michael Haggerty To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Aug 13 00:37:56 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Qs0MW-0005ZF-Af for gcvg-git-2@lo.gmane.org; Sat, 13 Aug 2011 00:37:56 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752693Ab1HLWhw (ORCPT ); Fri, 12 Aug 2011 18:37:52 -0400 Received: from einhorn.in-berlin.de ([192.109.42.8]:41166 "EHLO einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752614Ab1HLWhv (ORCPT ); Fri, 12 Aug 2011 18:37:51 -0400 X-Envelope-From: mhagger@alum.mit.edu Received: from michael.homenet.telecomitalia.it (p54BEAA34.dip.t-dialin.net [84.190.170.52]) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id p7CMaXJS010513; Sat, 13 Aug 2011 00:37:32 +0200 X-Mailer: git-send-email 1.7.6.8.gd2879 In-Reply-To: <1313188589-2330-1-git-send-email-mhagger@alum.mit.edu> X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Michael Haggerty --- refs.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/refs.c b/refs.c index 102ed03..8d1055d 100644 --- a/refs.c +++ b/refs.c @@ -157,6 +157,8 @@ static struct cached_refs { char did_packed; struct ref_list *loose; struct ref_list *packed; + /* The submodule name, or "" for the main repo. */ + char name[FLEX_ARRAY]; } *cached_refs, *submodule_refs; static struct ref_list *current_ref; @@ -181,12 +183,17 @@ static void clear_cached_refs(struct cached_refs *ca) ca->did_loose = ca->did_packed = 0; } -struct cached_refs *create_cached_refs() +struct cached_refs *create_cached_refs(const char *submodule) { + int len; struct cached_refs *refs; - refs = xmalloc(sizeof(struct cached_refs)); + if (!submodule) + submodule = ""; + len = strlen(submodule) + 1; + refs = xmalloc(sizeof(struct cached_refs) + len); refs->did_loose = refs->did_packed = 0; refs->loose = refs->packed = NULL; + memcpy(refs->name, submodule, len); return refs; } @@ -200,11 +207,11 @@ static struct cached_refs *get_cached_refs(const char *submodule) { if (! submodule) { if (!cached_refs) - cached_refs = create_cached_refs(); + cached_refs = create_cached_refs(submodule); return cached_refs; } else { if (!submodule_refs) - submodule_refs = create_cached_refs(); + submodule_refs = create_cached_refs(submodule); else /* For now, don't reuse the refs cache for submodules. */ clear_cached_refs(submodule_refs); -- 1.7.6.8.gd2879