From patchwork Sat Mar 30 11:18:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10878317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 71802139A for ; Sat, 30 Mar 2019 11:20:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D788288CB for ; Sat, 30 Mar 2019 11:20:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51D0728E48; Sat, 30 Mar 2019 11:20:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01BD928F70 for ; Sat, 30 Mar 2019 11:20:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730644AbfC3LUm (ORCPT ); Sat, 30 Mar 2019 07:20:42 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:37012 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730683AbfC3LUl (ORCPT ); Sat, 30 Mar 2019 07:20:41 -0400 Received: by mail-pl1-f196.google.com with SMTP id q6so2224152pll.4 for ; Sat, 30 Mar 2019 04:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QNHEfU5Es+iTRROnoumQYR2DGfc6CnyeuJUutLTjvtc=; b=k4gC2F/pdEVY50j27ZA0dyWPBfwJoBvNMZxfD9JEv08u0dUtnzQvjcxgc01rSee1eY cANVVo4VYa7DkjUvg1uP9ea7s1xtyRB+sytJ0NKgSiIR2xbPq6n1XzX26ji9O2OAIRdR N7NjZGVmImfR0mTjD2kBnEh/X3ABkfKmLOkBQNTDqF069KwEC/E5++mam4D7qGLxEKDY 6C/uNhFzzUgM0jnbo9sLSDOt+h4IXfs/rAo6FGouWga5ThNkaqGpjBBBuyx+V8qNV5wy SpNuktmvaphFL/lx2paRnB6EO5BkvsICg2tzHCwzd/9nOsA7NxT41HW+mCtDvxtCGIcG bElg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QNHEfU5Es+iTRROnoumQYR2DGfc6CnyeuJUutLTjvtc=; b=fP44CAHANS6N5QRZ1RmDNZNZH7zxgV35EYoblITULT9S8jFFCWWb8L9nKFjlc9nbtc sRcxVddBePDKscFZOFUbZkaHgrNYt5YMx0DZhye6i5uCtqpQmomyQzmV+pyfTzcY5oDw R8KpQj9U+PrGqMNzH88/k6X/KhpDXupY6DbF9ueUm87u/wYnbc9KdY0owlC9/vvyxxRI 8VhBxrjhyO9nrzsRbcoBnk8C12k4cabEwvAbRbdKmhX9fI8rA10f40xFIYSr1R6IjeXZ VPbNTCcEqDxzfv8wBMkhggQF7962Kzhf2qG4P8u+sGmaT8ERSVjO33b/Pxpw0827NkRu 2DjA== X-Gm-Message-State: APjAAAXMIsKBJiuT099svxWDBbZat1iQDZiXP7kIunokfVBbC2Nv6C+P 4QymDu32Lxg/8WQyrEY4fTDSezbP X-Google-Smtp-Source: APXvYqwggAaXdH9+29+ziTIl+JPRugUzTYAn2PcVzbuszmQ5mqYc93IrDAj0sHP8+y/f+KFaPwUGxQ== X-Received: by 2002:a17:902:2ec1:: with SMTP id r59mr53233220plb.171.1553944840814; Sat, 30 Mar 2019 04:20:40 -0700 (PDT) Received: from ash ([171.236.209.43]) by smtp.gmail.com with ESMTPSA id e22sm6357001pfi.126.2019.03.30.04.20.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Mar 2019 04:20:40 -0700 (PDT) Received: by ash (sSMTP sendmail emulation); Sat, 30 Mar 2019 18:20:36 +0700 From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: git@vger.kernel.org Cc: Stefan Beller , Junio C Hamano , =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41j?= =?utf-8?b?IER1eQ==?= Subject: [PATCH 03/31] refs.c: add refs_shorten_unambiguous_ref() Date: Sat, 30 Mar 2019 18:18:59 +0700 Message-Id: <20190330111927.18645-4-pclouds@gmail.com> X-Mailer: git-send-email 2.21.0.479.g47ac719cd3 In-Reply-To: <20190330111927.18645-1-pclouds@gmail.com> References: <20190330111927.18645-1-pclouds@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c | 11 +++++++++-- refs.h | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/refs.c b/refs.c index b869f32d8b..3dde824aab 100644 --- a/refs.c +++ b/refs.c @@ -1169,7 +1169,8 @@ int update_ref(const char *msg, const char *refname, old_oid, flags, onerr); } -char *shorten_unambiguous_ref(const char *refname, int strict) +char *refs_shorten_unambiguous_ref(struct ref_store *refs, + const char *refname, int strict) { int i; static char **scanf_fmts; @@ -1247,7 +1248,7 @@ char *shorten_unambiguous_ref(const char *refname, int strict) strbuf_reset(&resolved_buf); strbuf_addf(&resolved_buf, rule, short_name_len, short_name); - if (ref_exists(resolved_buf.buf)) + if (refs_ref_exists(refs, resolved_buf.buf)) break; } @@ -1266,6 +1267,12 @@ char *shorten_unambiguous_ref(const char *refname, int strict) return xstrdup(refname); } +char *shorten_unambiguous_ref(const char *refname, int strict) +{ + return refs_shorten_unambiguous_ref(get_main_ref_store(the_repository), + refname, strict); +} + static struct string_list *hide_refs; int parse_hide_refs_config(const char *var, const char *value, const char *section) diff --git a/refs.h b/refs.h index 308fa1f03b..5627570241 100644 --- a/refs.h +++ b/refs.h @@ -462,6 +462,8 @@ int check_refname_format(const char *refname, int flags); const char *prettify_refname(const char *refname); +char *refs_shorten_unambiguous_ref(struct ref_store *refs, + const char *refname, int strict); char *shorten_unambiguous_ref(const char *refname, int strict); /** rename ref, return 0 on success **/