git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 0/2] peel-ref optimization fixes
Date: Sat, 16 Mar 2013 05:00:19 -0400	[thread overview]
Message-ID: <20130316090018.GA26708@sigill.intra.peff.net> (raw)

These patches fix the issue with peel-ref noticed recently by Michael
(namely that we fail to correctly peel packed refs outside of
refs/tags).  The problem has been there since we added peeling support
to pack-refs, but traditionally "show-ref -d" was the only caller that
actually triggered the issue. Between that and the fact that most people
only put annotated tags into refs/tags, nobody really noticed.

Since my 435c833 (upload-pack: use peel_ref for ref advertisements,
2012-10-04), which is in v1.8.1, upload-pack can trigger the problem,
too, but I haven't actually heard of any reports in the wild.

I split it into two patches; the first one is the minimal fix that makes
git work properly going forward. The second one helps git be more robust
when reading packed-refs files generated by older git (or other
implementations). The second one depends semantically but not textually
on the first one; if you're worried about that, they can be squashed.

  [1/2]: pack-refs: write peeled entry for non-tags
  [2/2]: pack-refs: add fully-peeled trait

I think Michael may be rewriting some of this code, but if we are going
to go this direction with the fix (and I think we should), this is the
change that should go to maint in the meantime.

-Peff

             reply	other threads:[~2013-03-16  9:00 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-16  9:00 Jeff King [this message]
2013-03-16  9:01 ` [PATCH 1/2] pack-refs: write peeled entry for non-tags Jeff King
2013-03-16 13:50   ` Michael Haggerty
2013-03-17  6:02     ` Jeff King
2013-03-16  9:01 ` [PATCH 2/2] pack-refs: add fully-peeled trait Jeff King
2013-03-16 14:06   ` Michael Haggerty
2013-03-17  6:04     ` Jeff King
2013-03-17  5:50   ` Junio C Hamano
2013-03-17  5:55     ` Jeff King
2013-03-17  8:21 ` [PATCH v2 0/4] peel-ref optimization fixes Jeff King
2013-03-17  8:22   ` [PATCH v2 1/4] avoid segfaults on parse_object failure Jeff King
2013-03-17  8:23   ` [PATCH v2 2/4] use parse_object_or_die instead of die("bad object") Jeff King
2013-03-17  8:23   ` [PATCH v2 3/4] pack-refs: write peeled entry for non-tags Jeff King
2013-03-17  8:28   ` [PATCH v2 4/4] pack-refs: add fully-peeled trait Jeff King
2013-03-17 20:01     ` Junio C Hamano
2013-03-18 11:37       ` [PATCH v3 " Jeff King
2013-03-18 16:26         ` Junio C Hamano
2013-03-18  3:12     ` [PATCH v2 " Michael Haggerty
2013-03-18 15:12       ` Junio C Hamano

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=20130316090018.GA26708@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mhagger@alum.mit.edu \
    /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).