From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH v2 07/21] rerere: convert to use parse_pathspec Date: Fri, 11 Jan 2013 18:21:01 +0700 Message-ID: <1357903275-16804-8-git-send-email-pclouds@gmail.com> References: <1357903275-16804-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Junio C Hamano , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Jan 11 12:22:06 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TtcgW-0006qk-I1 for gcvg-git-2@plane.gmane.org; Fri, 11 Jan 2013 12:22:04 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753416Ab3AKLVo convert rfc822-to-quoted-printable (ORCPT ); Fri, 11 Jan 2013 06:21:44 -0500 Received: from mail-da0-f42.google.com ([209.85.210.42]:41167 "EHLO mail-da0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751599Ab3AKLVn (ORCPT ); Fri, 11 Jan 2013 06:21:43 -0500 Received: by mail-da0-f42.google.com with SMTP id z17so737313dal.29 for ; Fri, 11 Jan 2013 03:21:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=MEpTJLlkvgzUqboJH8AflQtq6ruyzisG0yLSUH7otmU=; b=K9SuF9bngLGF+vpai62UuVjjQBB8mYsxQdOIcDABPTAIpRDNbPM37qgyQ5J+9D3DKU h7ccwvH1/Jq1ogWAYRKwwU07135fo8bZChv2PsyFwTfkZzCNEo4LGS9o/JINKMaHxxfo gfKGaM2Vft6v1mgnAQeCZ5N9Rs8HYaC5w2TA3tUK6wVUtsuw2ZMWZ6Smcw/kAy5RkBkQ Qt5Fnf/38EmI4vVncXFvLmhkXoGuMj8vMn20taCN29IFadqL5kOJmhX8mrsdmPBlVxdm r5MWk1LfXKVQC/91nwhmKd01xHurJSp7kizoAJQ2qlZKXCDTtv76Li8DCpBxM0TUlsIi cl1Q== X-Received: by 10.66.73.68 with SMTP id j4mr24002374pav.84.1357903303557; Fri, 11 Jan 2013 03:21:43 -0800 (PST) Received: from lanh ([115.74.46.148]) by mx.google.com with ESMTPS id d2sm2942891paw.19.2013.01.11.03.21.40 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jan 2013 03:21:42 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Fri, 11 Jan 2013 18:21:58 +0700 X-Mailer: git-send-email 1.8.0.rc2.23.g1fb49df In-Reply-To: <1357903275-16804-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- builtin/rerere.c | 6 +++--- rerere.c | 8 ++++---- rerere.h | 4 +++- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/builtin/rerere.c b/builtin/rerere.c index dc1708e..a573c4a 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -68,11 +68,11 @@ int cmd_rerere(int argc, const char **argv, const c= har *prefix) return rerere(flags); =20 if (!strcmp(argv[0], "forget")) { - const char **pathspec; + struct pathspec pathspec; if (argc < 2) warning("'git rerere forget' without paths is deprecated"); - pathspec =3D get_pathspec(prefix, argv + 1); - return rerere_forget(pathspec); + parse_pathspec(&pathspec, PATHSPEC_FROMTOP, 0, prefix, argv + 1); + return rerere_forget(&pathspec); } =20 fd =3D setup_rerere(&merge_rr, flags); diff --git a/rerere.c b/rerere.c index a6a5cd5..f8ddf85 100644 --- a/rerere.c +++ b/rerere.c @@ -655,7 +655,7 @@ static int rerere_forget_one_path(const char *path,= struct string_list *rr) return 0; } =20 -int rerere_forget(const char **pathspec) +int rerere_forget(struct pathspec *pathspec) { int i, fd; struct string_list conflict =3D STRING_LIST_INIT_DUP; @@ -666,12 +666,12 @@ int rerere_forget(const char **pathspec) =20 fd =3D setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE); =20 - unmerge_cache(pathspec); + unmerge_cache(pathspec->raw); find_conflict(&conflict); for (i =3D 0; i < conflict.nr; i++) { struct string_list_item *it =3D &conflict.items[i]; - if (!match_pathspec(pathspec, it->string, strlen(it->string), - 0, NULL)) + if (!match_pathspec_depth(pathspec, it->string, strlen(it->string), + 0, NULL)) continue; rerere_forget_one_path(it->string, &merge_rr); } diff --git a/rerere.h b/rerere.h index 156d2aa..4aa06c9 100644 --- a/rerere.h +++ b/rerere.h @@ -3,6 +3,8 @@ =20 #include "string-list.h" =20 +struct pathspec; + #define RERERE_AUTOUPDATE 01 #define RERERE_NOAUTOUPDATE 02 =20 @@ -16,7 +18,7 @@ extern void *RERERE_RESOLVED; extern int setup_rerere(struct string_list *, int); extern int rerere(int); extern const char *rerere_path(const char *hex, const char *file); -extern int rerere_forget(const char **); +extern int rerere_forget(struct pathspec *); extern int rerere_remaining(struct string_list *); extern void rerere_clear(struct string_list *); extern void rerere_gc(struct string_list *); --=20 1.8.0.rc2.23.g1fb49df