summaryrefslogtreecommitdiff
path: root/builtin/rerere.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-07-14 08:35:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-15 17:56:07 (GMT)
commit01a10b0af9f84069f7c96cb4c94e1417cb7139c1 (patch)
treedf433921b409aef13475629a997ab5a0c5120a3c /builtin/rerere.c
parent15b55ae06a208dea4d10125d9655a84f5b62d781 (diff)
downloadgit-01a10b0af9f84069f7c96cb4c94e1417cb7139c1.zip
git-01a10b0af9f84069f7c96cb4c94e1417cb7139c1.tar.gz
git-01a10b0af9f84069f7c96cb4c94e1417cb7139c1.tar.bz2
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/rerere.c')
-rw-r--r--builtin/rerere.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c
index dc1708e..4e51add 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);