From: Max Kirillov <max@max630.net>
To: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Max Kirillov <max@max630.net>
Subject: [PATCH] reachable.c: add HEAD to reachability starting commits
Date: Sat, 30 Aug 2014 23:58:35 +0300 [thread overview]
Message-ID: <1409432315-20803-1-git-send-email-max@max630.net> (raw)
HEAD is not explicitly used as a starting commit for
calculating reachability, so if it's detached and reflogs
are disabled it may be pruned.
Add test which demonstrates it.
Signed-off-by: Max Kirillov <max@max630.net>
---
Hi.
This is a followup of http://thread.gmane.org/gmane.comp.version-control.git/255996
I digged it a bit more and look what I found!
Actually, I think would be nice if someone familiar with the code greps for
for_each_ref() usage and for each case verify if head should be added.
reachable.c | 3 +++
t/t5312-prune-detached.sh | 19 +++++++++++++++++++
2 files changed, 22 insertions(+)
create mode 100755 t/t5312-prune-detached.sh
diff --git a/reachable.c b/reachable.c
index 654a8c5..6f6835b 100644
--- a/reachable.c
+++ b/reachable.c
@@ -229,6 +229,9 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
/* Add all external refs */
for_each_ref(add_one_ref, revs);
+ /* detached HEAD is not included in the list above */
+ head_ref(add_one_ref, revs);
+
/* Add all reflog info */
if (mark_reflog)
for_each_reflog(add_one_reflog, revs);
diff --git a/t/t5312-prune-detached.sh b/t/t5312-prune-detached.sh
new file mode 100755
index 0000000..fac93e1
--- /dev/null
+++ b/t/t5312-prune-detached.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+test_description='no prune detached head without reflog'
+. ./test-lib.sh
+
+test_expect_success 'make repo' '
+ git config core.logAllRefUpdates false
+ git commit --allow-empty -m commit1 &&
+ git commit --allow-empty -m commit2 &&
+ git checkout --detach master &&
+ git commit --allow-empty -m commit3
+'
+
+test_expect_success 'prune does not delete anything' '
+ git prune -n >prune_actual &&
+ : >prune_expected &&
+ test_cmp prune_expected prune_actual'
+
+test_done
--
2.0.1.1697.g73c6810
next reply other threads:[~2014-08-30 21:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-30 20:58 Max Kirillov [this message]
2014-08-31 15:28 ` [PATCH] reachable.c: add HEAD to reachability starting commits Jeff King
2014-08-31 21:16 ` [PATCH v2] " Max Kirillov
2014-09-02 17:47 ` Junio C Hamano
2014-09-03 16:14 ` [PATCH v3] " Max Kirillov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409432315-20803-1-git-send-email-max@max630.net \
--to=max@max630.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).