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 28/45] Convert unmerge_cache to take struct pathspec Date: Sun, 9 Jun 2013 13:26:01 +0700 Message-ID: <1370759178-1709-29-git-send-email-pclouds@gmail.com> References: <1370759178-1709-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 Sun Jun 09 08:27:56 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 1UlZ6Y-0001AZ-LM for gcvg-git-2@plane.gmane.org; Sun, 09 Jun 2013 08:27:55 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752559Ab3FIG1u convert rfc822-to-quoted-printable (ORCPT ); Sun, 9 Jun 2013 02:27:50 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:46178 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752428Ab3FIG1t (ORCPT ); Sun, 9 Jun 2013 02:27:49 -0400 Received: by mail-pd0-f180.google.com with SMTP id 10so6297387pdi.11 for ; Sat, 08 Jun 2013 23:27:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=mCmCO6wZKfaUygsUuOKCtHPeiqdePQUJ1HL8O2RmCBI=; b=nsMzCmtScWxNYCBNyX89bB7t0BVA6zrMMtJYWd03sYJ33Z+4XW3jnlHzENBZRm+y/n yzijtVV/gGAptyoAtAZqXjLVNtVBBGt4OoIpBVpKQUOMhLjNpmgutEHUwULLUCfiV9Lv epNrlgU/liAH8powrU4QqtU+G+9VUTqL+e/Flfb5HugZN5fd+8905Ruj2cDjTJSy0XLg Sr11LEBYNi731sY7zofwcng3KFFsqQfnXTzMveTcw4WIBY/AjXD8eKSaDrqWIiwmTUBn cQ1GYr7m99Fk354bVYcnPK+MDuxsXQcHD7QcNZumMkho7aoFf83eU0EbEreoirkW8ZIy NyMA== X-Received: by 10.66.216.136 with SMTP id oq8mr9063394pac.161.1370759269530; Sat, 08 Jun 2013 23:27:49 -0700 (PDT) Received: from lanh ([115.73.237.130]) by mx.google.com with ESMTPSA id k3sm5528756pbc.23.2013.06.08.23.27.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 08 Jun 2013 23:27:48 -0700 (PDT) Received: by lanh (sSMTP sendmail emulation); Sun, 09 Jun 2013 13:29:21 +0700 X-Mailer: git-send-email 1.8.2.83.gc99314b In-Reply-To: <1370759178-1709-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 --- rerere.c | 2 +- resolve-undo.c | 4 ++-- resolve-undo.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rerere.c b/rerere.c index 27afbfe..4105bca 100644 --- a/rerere.c +++ b/rerere.c @@ -668,7 +668,7 @@ int rerere_forget(struct pathspec *pathspec) =20 fd =3D setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE); =20 - unmerge_cache(pathspec->raw); + unmerge_cache(pathspec); find_conflict(&conflict); for (i =3D 0; i < conflict.nr; i++) { struct string_list_item *it =3D &conflict.items[i]; diff --git a/resolve-undo.c b/resolve-undo.c index 639eb9c..4b78e6f 100644 --- a/resolve-undo.c +++ b/resolve-undo.c @@ -173,7 +173,7 @@ void unmerge_marked_index(struct index_state *istat= e) } } =20 -void unmerge_index(struct index_state *istate, const char **pathspec) +void unmerge_index(struct index_state *istate, const struct pathspec *= pathspec) { int i; =20 @@ -182,7 +182,7 @@ void unmerge_index(struct index_state *istate, cons= t char **pathspec) =20 for (i =3D 0; i < istate->cache_nr; i++) { struct cache_entry *ce =3D istate->cache[i]; - if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, NULL)) + if (!match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NUL= L)) continue; i =3D unmerge_index_entry_at(istate, i); } diff --git a/resolve-undo.h b/resolve-undo.h index 7a30206..4630645 100644 --- a/resolve-undo.h +++ b/resolve-undo.h @@ -11,7 +11,7 @@ extern void resolve_undo_write(struct strbuf *, struc= t string_list *); extern struct string_list *resolve_undo_read(const char *, unsigned lo= ng); extern void resolve_undo_clear_index(struct index_state *); extern int unmerge_index_entry_at(struct index_state *, int); -extern void unmerge_index(struct index_state *, const char **); +extern void unmerge_index(struct index_state *, const struct pathspec = *); extern void unmerge_marked_index(struct index_state *); =20 #endif --=20 1.8.2.83.gc99314b