From: Junio C Hamano <gitster@pobox.com>
To: Max Kirillov <max@max630.net>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: [PATCH v2] reachable.c: add HEAD to reachability starting commits
Date: Tue, 02 Sep 2014 10:47:40 -0700 [thread overview]
Message-ID: <xmqq4mwp3oeb.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1409519804-15960-1-git-send-email-max@max630.net> (Max Kirillov's message of "Mon, 1 Sep 2014 00:16:44 +0300")
Max Kirillov <max@max630.net> writes:
> 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 tests which demonstrate it. Test 'prune: prune former HEAD after checking
> out branch' also reverts changes to repository.
>
> Signed-off-by: Max Kirillov <max@max630.net>
> ---
> Inserted test into existing script.
> reachable.c | 3 +++
> t/t5304-prune.sh | 21 +++++++++++++++++++++
> 2 files changed, 24 insertions(+)
>
> 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);
> +
Unlike the change to rev-parse, which I haven't decided if I like
it, this is definitely the right thing to do.
Thanks for catching.
> /* Add all reflog info */
> if (mark_reflog)
> for_each_reflog(add_one_reflog, revs);
> diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
> index 377d3d3..77cf064 100755
> --- a/t/t5304-prune.sh
> +++ b/t/t5304-prune.sh
> @@ -104,6 +104,27 @@ test_expect_success 'prune: prune unreachable heads' '
>
> '
>
> +test_expect_success 'prune: do not prune detached HEAD with no reflog' '
> +
> + git config core.logAllRefUpdates false &&
> + test ! -e .git/logs &&
This test is somewhat iffy; if you had it just before "git prune", I
would understand that it matches what the title of the test claims,
though.
> + git checkout --detach --quiet &&
> + git commit --allow-empty -m "detached commit" &&
> + git prune -n >prune_actual &&
> + : >prune_expected &&
> + test_cmp prune_actual prune_expected
> +
> +'
> +
> +test_expect_success 'prune: prune former HEAD after checking out branch' '
> +
> + head_sha1=`git rev-parse HEAD` &&
Favor $(...) over `...`.
> + git checkout --quiet master &&
> + git prune -v >prune_actual &&
> + grep -q "$head_sha1" prune_actual
Please don't use "grep -q"; unless running the test with "-v", we
wouldn't have to see the output anyway.
> +
> +'
> +
> test_expect_success 'prune: do not prune heads listed as an argument' '
>
> : > file2 &&
next prev parent reply other threads:[~2014-09-02 17:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-30 20:58 [PATCH] reachable.c: add HEAD to reachability starting commits Max Kirillov
2014-08-31 15:28 ` Jeff King
2014-08-31 21:16 ` [PATCH v2] " Max Kirillov
2014-09-02 17:47 ` Junio C Hamano [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4mwp3oeb.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=max@max630.net \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).