From 5a9f03952927da82ce70822f3d0c5b4b1d37be4f Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Thu, 21 Jan 2010 09:23:48 +0100 Subject: Make 'rerere forget' work from a subdirectory. It forgot to apply the prefix to the paths given on the command line. [jc: added test] Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano --- builtin-rerere.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'builtin-rerere.c') diff --git a/builtin-rerere.c b/builtin-rerere.c index 25f507a2f1..34f9acee91 100644 --- a/builtin-rerere.c +++ b/builtin-rerere.c @@ -120,8 +120,10 @@ int cmd_rerere(int argc, const char **argv, const char *prefix) if (argc < 2) return rerere(flags); - if (!strcmp(argv[1], "forget")) - return rerere_forget(argv + 2); + if (!strcmp(argv[1], "forget")) { + const char **pathspec = get_pathspec(prefix, argv + 2); + return rerere_forget(pathspec); + } fd = setup_rerere(&merge_rr, flags); if (fd < 0) -- cgit v1.2.3