From mboxrd@z Thu Jan 1 00:00:00 1970 From: mhagger@alum.mit.edu Subject: [PATCH v2 02/12] repack_without_ref(): remove temporary Date: Fri, 28 Oct 2011 13:27:54 +0200 Message-ID: <1319801284-15625-3-git-send-email-mhagger@alum.mit.edu> References: <1319801284-15625-1-git-send-email-mhagger@alum.mit.edu> Cc: git@vger.kernel.org, Jeff King , Drew Northup , Jakub Narebski , Heiko Voigt , Johan Herland , Julian Phillips , Michael Haggerty To: Junio C Hamano X-From: git-owner@vger.kernel.org Fri Oct 28 13:28:25 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 1RJkbm-0002Nv-T9 for gcvg-git-2@lo.gmane.org; Fri, 28 Oct 2011 13:28:23 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932190Ab1J1L2Q (ORCPT ); Fri, 28 Oct 2011 07:28:16 -0400 Received: from mail.berlin.jpk.com ([212.222.128.130]:54964 "EHLO mail.berlin.jpk.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755446Ab1J1L2O (ORCPT ); Fri, 28 Oct 2011 07:28:14 -0400 Received: from michael.berlin.jpk.com ([192.168.100.152]) by mail.berlin.jpk.com with esmtp (Exim 4.50) id 1RJkVI-0007Cx-Ea; Fri, 28 Oct 2011 13:21:40 +0200 X-Mailer: git-send-email 1.7.7 In-Reply-To: <1319801284-15625-1-git-send-email-mhagger@alum.mit.edu> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: From: Michael Haggerty Signed-off-by: Michael Haggerty --- refs.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/refs.c b/refs.c index 855c791..7191437 100644 --- a/refs.c +++ b/refs.c @@ -1282,12 +1282,10 @@ static struct lock_file packlock; static int repack_without_ref(const char *refname) { struct ref_array *packed; - struct ref_entry *ref; int fd, i; packed = get_packed_refs(get_ref_cache(NULL)); - ref = search_ref_array(packed, refname); - if (ref == NULL) + if (search_ref_array(packed, refname) == NULL) return 0; fd = hold_lock_file_for_update(&packlock, git_path("packed-refs"), 0); if (fd < 0) { @@ -1298,8 +1296,7 @@ static int repack_without_ref(const char *refname) for (i = 0; i < packed->nr; i++) { char line[PATH_MAX + 100]; int len; - - ref = packed->refs[i]; + struct ref_entry *ref = packed->refs[i]; if (!strcmp(refname, ref->name)) continue; -- 1.7.7