diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-07-14 15:35:40 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:56:07 -0700 |
| commit | 01a10b0af9f84069f7c96cb4c94e1417cb7139c1 (patch) | |
| tree | df433921b409aef13475629a997ab5a0c5120a3c /builtin | |
| parent | status: convert to use parse_pathspec (diff) | |
| download | tgif-01a10b0af9f84069f7c96cb4c94e1417cb7139c1.tar.xz | |
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rerere.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c index dc1708e6d6..4e51addb3e 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -6,6 +6,7 @@ #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]"), @@ -68,11 +69,12 @@ int cmd_rerere(int argc, const char **argv, const char *prefix) 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"); - 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); |