git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 3/5] Add tests for git-prune

From
Junio C Hamano <junio@pobox.com>
Date
Mar 25, 2008, 06:59 UTC
Message-ID
<7v63vbnvak.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<200803242218.44026.barra_cuda@katamail.com>
From: Michele Ballabio <barra_cuda@katamail.com>
Date: Sun, 23 Mar 2008 22:34:34 +0100

It seems that git prune changed behaviour with respect to revisions added from command line, probably when it became a builtin. Currently, it prints a short usage and exits: instead, it should take those revisions into account and not prune them. So add a couple of test to point this out.

We'll be fixing this by switching to parse_options(), so add tests to detect bogus command line parameters as well, to keep ourselves from introducing regressions.

Signed-off-by: Michele Ballabio <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t5304-prune.sh |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 47090c4..3d81e1f 100644
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -78,4 +78,38 @@ test_expect_success 'gc: start with ok gc.pruneExpire' '
 
 '
 
+test_expect_success 'prune: prune nonsense parameters' '
+
+	test_must_fail git prune garbage &&
+	test_must_fail git prune --- &&
+	test_must_fail git prune --no-such-option
+
+'
+
+test_expect_success 'prune: prune unreachable heads' '
+
+	git config core.logAllRefUpdates false &&
+	mv .git/logs .git/logs.old &&
+	: > file2 &&
+	git add file2 &&
+	git commit -m temporary &&
+	tmp_head=$(git rev-list -1 HEAD) &&
+	git reset HEAD^ &&
+	git prune &&
+	test_must_fail git reset $tmp_head --
+
+'
+
+test_expect_failure 'prune: do not prune heads listed as an argument' '
+
+	: > file2 &&
+	git add file2 &&
+	git commit -m temporary &&
+	tmp_head=$(git rev-list -1 HEAD) &&
+	git reset HEAD^ &&
+	git prune -- $tmp_head &&
+	git reset $tmp_head --
+
+'
+
 test_done
-- 
1.5.5.rc1.121.g1594
Previous: Johannes SchindelinNext: Junio C Hamano
Message 17 of 22 in “builtin-prune.c: fix object parsing and use parse_options()”
  1. 2/2 builtin-prune.c: fix object parsing and use parse_options()Michele Ballabio, Mar 23, 2008
  2. Johannes SchindelinMar 23, 2008
  3. Michele BallabioMar 24, 2008
  4. Johannes SchindelinMar 24, 2008
  5. 3/2 parse-options.c: introduce OPT_DATEMichele Ballabio, Mar 24, 2008
  6. Johannes SchindelinMar 24, 2008
  7. Michele BallabioMar 24, 2008
  8. Johannes SchindelinMar 24, 2008
  9. Junio C HamanoMar 24, 2008
  10. Michele BallabioMar 24, 2008
  11. Junio C HamanoMar 25, 2008
  12. 1/5 parse-options.c: introduce OPT_DATEJunio C Hamano, Mar 25, 2008
  13. 2/5 test_must_fail: 129 is a valid error code from usage()Junio C Hamano, Mar 25, 2008
  14. Johannes SchindelinMar 25, 2008
  15. Johannes SixtMar 25, 2008
  16. Johannes SchindelinMar 25, 2008
  17. 3/5 Add tests for git-pruneJunio C Hamano, Mar 25, 2008
  18. 4/5 builtin-prune.c: use parse_options()Junio C Hamano, Mar 25, 2008
  19. 5/5 builtin-prune: protect objects listed on the command lineJunio C Hamano, Mar 25, 2008
  20. Junio C HamanoMar 27, 2008
  21. Johannes SchindelinMar 27, 2008
  22. Michele BallabioMar 27, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.