rerere: convert to use parse_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:

committed by
Junio C Hamano

parent
15b55ae06a
commit
01a10b0af9
9
rerere.c
9
rerere.c
@ -6,6 +6,7 @@
|
||||
#include "resolve-undo.h"
|
||||
#include "ll-merge.h"
|
||||
#include "attr.h"
|
||||
#include "pathspec.h"
|
||||
|
||||
#define RESOLVED 0
|
||||
#define PUNTED 1
|
||||
@ -656,7 +657,7 @@ static int rerere_forget_one_path(const char *path, struct string_list *rr)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int rerere_forget(const char **pathspec)
|
||||
int rerere_forget(struct pathspec *pathspec)
|
||||
{
|
||||
int i, fd;
|
||||
struct string_list conflict = STRING_LIST_INIT_DUP;
|
||||
@ -667,12 +668,12 @@ int rerere_forget(const char **pathspec)
|
||||
|
||||
fd = setup_rerere(&merge_rr, RERERE_NOAUTOUPDATE);
|
||||
|
||||
unmerge_cache(pathspec);
|
||||
unmerge_cache(pathspec->raw);
|
||||
find_conflict(&conflict);
|
||||
for (i = 0; i < conflict.nr; i++) {
|
||||
struct string_list_item *it = &conflict.items[i];
|
||||
if (!match_pathspec(pathspec, it->string, strlen(it->string),
|
||||
0, NULL))
|
||||
if (!match_pathspec_depth(pathspec, it->string, strlen(it->string),
|
||||
0, NULL))
|
||||
continue;
|
||||
rerere_forget_one_path(it->string, &merge_rr);
|
||||
}
|
||||
|
Reference in New Issue
Block a user