git-prune used to remove loose objects whether they were specified in
the command line or not. This patch makes git-prune behave as stated
in the manpage: it does not prune any listed head nor reachable objects;
the parsing machinery now uses parse_options().
Signed-off-by: Michele Ballabio <barra_cuda@xxxxxxxxxxxx>
---
builtin-prune.c | 50 ++++++++++++++++++++++++++++++--------------------
t/t5304-prune.sh | 2 +-
2 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/builtin-prune.c b/builtin-prune.c
index bb8ead9..7b3e15d 100644
--- a/builtin-prune.c
+++ b/builtin-prune.c
@@ -4,8 +4,12 @@
#include "revision.h"
#include "builtin.h"
#include "reachable.h"
+#include "parse-options.h"
-static const char prune_usage[] = "git-prune [-n]";
+static const char * const prune_usage[] = {
+ "git-prune [-n] [--expire <time>] [--] [<head>...]",
+ NULL
+};
static int show_only;
static unsigned long expire;
@@ -121,32 +125,38 @@ static void remove_temporary_files(void)
closedir(dir);
}
+static int parse_opt_expire(const struct option *opt, const char *arg,
+ int unset)
+{
+ expire = approxidate(arg);
+ return 0;
+}
+
int cmd_prune(int argc, const char **argv, const char *prefix)
{
- int i;
struct rev_info revs;
- for (i = 1; i < argc; i++) {
- const char *arg = argv[i];
- if (!strcmp(arg, "-n")) {
- show_only = 1;
- continue;
- }
- if (!strcmp(arg, "--expire")) {
- if (++i < argc) {
- expire = approxidate(argv[i]);
- continue;
- }
- }
- else if (!prefixcmp(arg, "--expire=")) {
- expire = approxidate(arg + 9);
- continue;
- }
- usage(prune_usage);
- }
+ const struct option options[] = {
+ OPT_BOOLEAN('n', NULL, &show_only,
+ "do not remove, show only"),
+ OPT_CALLBACK(0, "expire", &expire, "time",
+ "expire objects older than <time>",
+ parse_opt_expire),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, options, prune_usage,
+ PARSE_OPT_STOP_AT_NON_OPTION |
+ PARSE_OPT_KEEP_DASHDASH);
save_commit_buffer = 0;
init_revisions(&revs, prefix);
+
+ if (argc > 1)
+ argc = setup_revisions(argc, argv, &revs, NULL);
+ if (argc > 1)
+ die ("unrecognized argument: %s", argv[1]);
+
mark_reachable_objects(&revs, 1);
prune_object_dir(get_object_directory());
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index d5f12f7..0638297 100644
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -92,7 +92,7 @@ test_expect_success 'prune: prune unreachable heads' '
'
-test_expect_failure 'prune: do not prune heads listed as an argument' '
+test_expect_success 'prune: do not prune heads listed as an argument' '
: > file2 &&
git add file2 &&
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
