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 15/21] Convert unmerge_cache to take struct pathspec Date: Sun, 6 Jan 2013 13:21:02 +0700 Message-ID: <1357453268-12543-16-git-send-email-pclouds@gmail.com> References: <1357453268-12543-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?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 Jan 06 07:22:57 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 1TrjdJ-0000Nz-7r for gcvg-git-2@plane.gmane.org; Sun, 06 Jan 2013 07:22:57 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751451Ab3AFGWh convert rfc822-to-quoted-printable (ORCPT ); Sun, 6 Jan 2013 01:22:37 -0500 Received: from mail-pb0-f44.google.com ([209.85.160.44]:49073 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751080Ab3AFGWg (ORCPT ); Sun, 6 Jan 2013 01:22:36 -0500 Received: by mail-pb0-f44.google.com with SMTP id uo1so9985855pbc.17 for ; Sat, 05 Jan 2013 22:22:35 -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=ty2QY5zxab1HFc096gp+UOUvEj2TgWsL2KvNL/X90PU=; b=dseCzlZw9jujbd2VMcX+FXBKidN5Z0lzibkf/idA9ODfV9GBt+Z+1st74cIeCD+B+F fR0x3CxhJXSdlFc+HcjGvuiBjtBj8Kf+NRxJvY5aAeWP0CpnU+ICT8/OyZsd4Ns+guVH V5vmjdeORg4NZNAzluMqgTqua3dD5lBMi6CpHkjXHsEiGNjgqTfLVxR6vFsDMbFGPOeZ KA0XbayUopdX4C/DwFYIVn+BDZAAFgU18ERlpGgXS/c5oVOKxULoG4qoIueNrRu8BdUG nmspS4IrqBG52b4UZOF4xa+Vy7REiDoTgv3fQHqFtxddCvq9YTLUSDYP8AEmOxDtd9D1 GIBw== X-Received: by 10.66.82.230 with SMTP id l6mr167912149pay.12.1357453355651; Sat, 05 Jan 2013 22:22:35 -0800 (PST) Received: from lanh ([115.74.34.31]) by mx.google.com with ESMTPS id pl10sm35285165pbc.60.2013.01.05.22.22.32 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 05 Jan 2013 22:22:35 -0800 (PST) Received: by lanh (sSMTP sendmail emulation); Sun, 06 Jan 2013 13:22:45 +0700 X-Mailer: git-send-email 1.8.0.rc2.23.g1fb49df In-Reply-To: <1357453268-12543-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/checkout.c | 2 +- rerere.c | 2 +- resolve-undo.c | 4 ++-- resolve-undo.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 00910dc..aa399d6 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -281,7 +281,7 @@ static int checkout_paths(const struct checkout_opt= s *opts, =20 /* "checkout -m path" to recreate conflicted state */ if (opts->merge) - unmerge_cache(opts->pathspec.raw); + unmerge_cache(&opts->pathspec); =20 /* Any unmerged paths? */ for (pos =3D 0; pos < active_nr; pos++) { diff --git a/rerere.c b/rerere.c index f8ddf85..9d149fa 100644 --- a/rerere.c +++ b/rerere.c @@ -666,7 +666,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 72b4612..1bfece2 100644 --- a/resolve-undo.c +++ b/resolve-undo.c @@ -156,7 +156,7 @@ int unmerge_index_entry_at(struct index_state *ista= te, int pos) return unmerge_index_entry_at(istate, pos); } =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 @@ -165,7 +165,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 8458769..81e8803 100644 --- a/resolve-undo.h +++ b/resolve-undo.h @@ -11,6 +11,6 @@ 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 = *); =20 #endif --=20 1.8.0.rc2.23.g1fb49df