builtin-prune: protect objects listed on the command line

gitster · gitster · commit fe308f53730f · 2008-03-27T15:39:57.000-07:00
Finally, this resurrects the documented behaviour to protect other
objects listed on the command line from getting pruned.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-prune.c b/builtin-prune.c
@@ -140,8 +140,19 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 	init_revisions(&revs, prefix);
 
 	argc = parse_options(argc, argv, options, prune_usage, 0);
-	if (argc)
-		die ("unrecognized argument: %s", name);
+	while (argc--) {
+		unsigned char sha1[20];
+		const char *name = *argv++;
+
+		if (!get_sha1(name, sha1)) {
+			struct object *object = parse_object(sha1);
+			if (!object)
+				die("bad object: %s", name);
+			add_pending_object(&revs, object, "");
+		}
+		else
+			die("unrecognized argument: %s", name);
+	}
 	mark_reachable_objects(&revs, 1);
 	prune_object_dir(get_object_directory());
 
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
@@ -100,7 +100,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 &&

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ test_expect_success 'prune: prune unreachable heads' '`
`100`	`100`
`101`	`101`	`'`
`102`	`102`
`103`		`-test_expect_failure 'prune: do not prune heads listed as an argument' '`
	`103`	`+test_expect_success 'prune: do not prune heads listed as an argument' '`
`104`	`104`
`105`	`105`	`: > file2 &&`
`106`	`106`	`git add file2 &&`