convert unmerge_cache to take struct pathspec

pclouds · gitster · commit 5ab06518a71a · 2013-07-15T10:56:08.000-07:00
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/rerere.c b/rerere.c
@@ -668,7 +668,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
@@ -173,7 +173,7 @@ void unmerge_marked_index(struct index_state *istate)
 	}
 }
 
-void unmerge_index(struct index_state *istate, const char **pathspec)
+void unmerge_index(struct index_state *istate, const struct pathspec *pathspec)
 {
 	int i;
 
@@ -182,7 +182,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
@@ -11,7 +11,7 @@ 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 *);
 extern void unmerge_marked_index(struct index_state *);
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ void unmerge_marked_index(struct index_state *istate)`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`		`-void unmerge_index(struct index_state istate, const char *pathspec)`
	`176`	`+void unmerge_index(struct index_state istate, const struct pathspec pathspec)`
`177`	`177`	`{`
`178`	`178`	`int i;`
`179`	`179`
`@@ -182,7 +182,7 @@ void unmerge_index(struct index_state istate, const char *pathspec)`
`182`	`182`
`183`	`183`	`for (i = 0; i < istate->cache_nr; i++) {`
`184`	`184`	`struct cache_entry *ce = istate->cache[i];`
`185`		`- if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, NULL))`
	`185`	`+ if (!match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL))`
`186`	`186`	`continue;`
`187`	`187`	`i = unmerge_index_entry_at(istate, i);`
`188`	`188`	`}`