From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 15/21] Convert unmerge_cache to take struct pathspec
Date: Sun, 6 Jan 2013 13:21:02 +0700 [thread overview]
Message-ID: <1357453268-12543-16-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1357453268-12543-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
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_opts *opts,
/* "checkout -m path" to recreate conflicted state */
if (opts->merge)
- unmerge_cache(opts->pathspec.raw);
+ unmerge_cache(&opts->pathspec);
/* Any unmerged paths? */
for (pos = 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)
fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE);
- unmerge_cache(pathspec->raw);
+ unmerge_cache(pathspec);
find_conflict(&conflict);
for (i = 0; i < conflict.nr; i++) {
struct string_list_item *it = &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 *istate, int pos)
return unmerge_index_entry_at(istate, pos);
}
-void unmerge_index(struct index_state *istate, const char **pathspec)
+void unmerge_index(struct index_state *istate, const struct pathspec *pathspec)
{
int i;
@@ -165,7 +165,7 @@ void unmerge_index(struct index_state *istate, const char **pathspec)
for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce = 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, NULL))
continue;
i = 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 *, struct string_list *);
extern struct string_list *resolve_undo_read(const char *, unsigned long);
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 *);
#endif
--
1.8.0.rc2.23.g1fb49df
next prev parent reply other threads:[~2013-01-06 6:22 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-06 6:20 [PATCH 00/21] "struct pathspec" conversion Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 01/21] pathspec: save the non-wildcard length part Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 02/21] Add parse_pathspec() that converts cmdline args to struct pathspec Nguyễn Thái Ngọc Duy
2013-01-10 23:26 ` Martin von Zweigbergk
2013-01-11 2:33 ` Duy Nguyen
2013-01-06 6:20 ` [PATCH 03/21] pathspec: make sure the prefix part is wildcard-clean Nguyễn Thái Ngọc Duy
2013-01-07 1:10 ` Duy Nguyen
2013-01-06 6:20 ` [PATCH 04/21] Export parse_pathspec() and convert some get_pathspec() calls Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 05/21] clean: convert to use parse_pathspec Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 06/21] commit: " Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 07/21] status: " Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 08/21] rerere: " Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 09/21] checkout: " Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 10/21] rm: " Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 11/21] ls-files: " Nguyễn Thái Ngọc Duy
2013-01-06 6:20 ` [PATCH 12/21] archive: " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 13/21] add: " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 14/21] Convert read_cache_preload() to take struct pathspec Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` Nguyễn Thái Ngọc Duy [this message]
2013-01-06 6:21 ` [PATCH 16/21] checkout: convert read_tree_some " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 17/21] Convert report_path_error " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 18/21] Convert refresh_index " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 19/21] Convert {read,fill}_directory " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 20/21] Convert add_files_to_cache " Nguyễn Thái Ngọc Duy
2013-01-06 6:21 ` [PATCH 21/21] Convert more init_pathspec() to parse_pathspec() Nguyễn Thái Ngọc Duy
2013-01-06 21:45 ` [PATCH 00/21] "struct pathspec" conversion Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357453268-12543-16-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).