зеркало из https://github.com/microsoft/git.git
convert unmerge_cache to take struct pathspec
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:
Родитель
480ca6449e
Коммит
5ab06518a7
2
rerere.c
2
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];
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче