diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2010-01-21 09:23:48 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-21 00:42:20 -0800 |
| commit | 5a9f03952927da82ce70822f3d0c5b4b1d37be4f (patch) | |
| tree | ebe60c4d32624559ab4e78aace0e6e0e470eaa18 /builtin-rerere.c | |
| parent | 28414b6b3a0eaf0d0c010c71634a8a832b7972f2 (diff) | |
| download | git-5a9f03952927da82ce70822f3d0c5b4b1d37be4f.tar.gz | |
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 <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-rerere.c')
| -rw-r--r-- | builtin-rerere.c | 6 |
1 files changed, 4 insertions, 2 deletions
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) |