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>

diff --git a/builtin/rerere.c b/builtin/rerere.c
index dc1708e6d6de54b5aaec36d5ff4242bd60183f0a..4e51addb3e135465bdb728bb00c5dc3dd53b7c51 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -6,6 +6,7 @@
 #include "rerere.h"
 #include "xdiff/xdiff.h"
 #include "xdiff-interface.h"
 #include "rerere.h"
 #include "xdiff/xdiff.h"
 #include "xdiff-interface.h"

+#include "pathspec.h"

 
 static const char * const rerere_usage[] = {
        N_("git rerere [clear | forget path... | status | remaining | diff | gc]"),
 
 static const char * const rerere_usage[] = {
        N_("git rerere [clear | forget path... | status | remaining | diff | gc]"),


@@ -68,11 +69,12 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
                return rerere(flags);
 
        if (!strcmp(argv[0], "forget")) {
                return rerere(flags);
 
        if (!strcmp(argv[0], "forget")) {

-               const char **pathspec;
+               struct pathspec pathspec;

                if (argc < 2)
                        warning("'git rerere forget' without paths is deprecated");
                if (argc < 2)
                        warning("'git rerere forget' without paths is deprecated");

-               pathspec = get_pathspec(prefix, argv + 1);
-               return rerere_forget(pathspec);
+               parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD,
+                              prefix, argv + 1);
+               return rerere_forget(&pathspec);

        }
 
        fd = setup_rerere(&merge_rr, flags);
        }
 
        fd = setup_rerere(&merge_rr, flags);

diff --git a/rerere.c b/rerere.c
index 98e3e294d0dc295290b7b891a834186c0791e43a..27afbfe90e3d62b2ff2d925851fb89cc0f199938 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -6,6 +6,7 @@
 #include "resolve-undo.h"
 #include "ll-merge.h"
 #include "attr.h"
 #include "resolve-undo.h"
 #include "ll-merge.h"
 #include "attr.h"

+#include "pathspec.h"

 
 #define RESOLVED 0
 #define PUNTED 1
 
 #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;
 }
 
        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;
 {
        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);
 
 
        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];
        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);
        }
                        continue;
                rerere_forget_one_path(it->string, &merge_rr);
        }

diff --git a/rerere.h b/rerere.h
index 156d2aad804527d5ae766b5381f3b5e0d2176580..4aa06c9a519aa289f177487b41e3f6c5b1213ef4 100644 (file)
--- a/rerere.h
+++ b/rerere.h
@@ -3,6 +3,8 @@
 
 #include "string-list.h"
 
 
 #include "string-list.h"
 

+struct pathspec;
+

 #define RERERE_AUTOUPDATE   01
 #define RERERE_NOAUTOUPDATE 02
 
 #define RERERE_AUTOUPDATE   01
 #define RERERE_NOAUTOUPDATE 02
 


@@ -16,7 +18,7 @@ extern void *RERERE_RESOLVED;
 extern int setup_rerere(struct string_list *, int);
 extern int rerere(int);
 extern const char *rerere_path(const char *hex, const char *file);
 extern int setup_rerere(struct string_list *, int);
 extern int rerere(int);
 extern const char *rerere_path(const char *hex, const char *file);

-extern int rerere_forget(const char **);
+extern int rerere_forget(struct pathspec *);

 extern int rerere_remaining(struct string_list *);
 extern void rerere_clear(struct string_list *);
 extern void rerere_gc(struct string_list *);
 extern int rerere_remaining(struct string_list *);
 extern void rerere_clear(struct string_list *);
 extern void rerere_gc(struct string_list *);