mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert unmerge_cache to take struct pathspec

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2013-07-14 15:35:51 +07:00
committed by Junio C Hamano
parent 480ca6449e
commit 5ab06518a7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rerere.c
View File

@ -668,7 +668,7 @@ int rerere_forget(struct pathspec *pathspec)
fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE); fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE);
unmerge_cache(pathspec->raw); unmerge_cache(pathspec);
find_conflict(&conflict); find_conflict(&conflict);
for (i = 0; i < conflict.nr; i++) { for (i = 0; i < conflict.nr; i++) {
struct string_list_item *it = &conflict.items[i]; struct string_list_item *it = &conflict.items[i];

4
resolve-undo.c
View File

@ -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; int i;
@ -182,7 +182,7 @@ void unmerge_index(struct index_state *istate, const char **pathspec)
for (i = 0; i < istate->cache_nr; i++) { for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce = istate->cache[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; continue;
i = unmerge_index_entry_at(istate, i); i = unmerge_index_entry_at(istate, i);
} }

2
resolve-undo.h
View File

@ -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 struct string_list *resolve_undo_read(const char *, unsigned long);
extern void resolve_undo_clear_index(struct index_state *); extern void resolve_undo_clear_index(struct index_state *);
extern int unmerge_index_entry_at(struct index_state *, int); 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 *); extern void unmerge_marked_index(struct index_state *);
#endif #endif