From: Jeff King <peff@peff.net>
To: Kirill Smelkov <kirr@nexedi.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Jonathan Tan <jonathantanmy@google.com>,
Brandon Williams <bmwill@google.com>,
Takuto Ikuta <tikuta@chromium.org>,
Jeff Hostetler <jeffhost@microsoft.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org
Subject: Re: [PATCH] fetch-pack: demonstrate --all breakage when remote have tags to non-commit objects
Date: Mon, 11 Jun 2018 00:20:16 -0400 [thread overview]
Message-ID: <20180611042016.GA31642@sigill.intra.peff.net> (raw)
In-Reply-To: <20180610143231.7131-1-kirr@nexedi.com>
On Sun, Jun 10, 2018 at 02:32:57PM +0000, Kirill Smelkov wrote:
> Added test shows remote with two tag objects pointing to a blob and a
> tree. The tag objects themselves are referenced from under regular
> refs/tags/* namespace. If test_expect_failure is changed to
> test_expect_success the test fails:
Interesting case. The problem is actually that upload-pack complains:
> fatal: git upload-pack: not our ref 038f48ad0beaffbea71d186a05084b79e3870cbf
And that sha1 is the tagged blob:
> bc4e9e1fa80662b449805b1ac29fc9b1e4c49187 refs/tags/tag-to-blob # <-- NOTE
> 038f48ad0beaffbea71d186a05084b79e3870cbf refs/tags/tag-to-blob^{}
> 520db1f5e1afeaa12b1a8d73ce82db72ca036ee1 refs/tags/tag-to-tree # <-- NOTE
> 7395c100223b7cd760f58ccfa0d3f3d2dd539bb6 refs/tags/tag-to-tree^{}
So it seems like upload-pack is at fault for not marking the object as a
tip when it peels the tag.
> For the reference, porcelain fetch 'refs/*:refs/origin/*' works:
That's because it doesn't actually issue a "want" for the peeled blob
(it doesn't need to, because it's fetching the tag itself). So it
happens to work, but I still think upload-pack is at fault for not
accepting the "want" on the blob it advertised.
Doubly interesting, it looks like this case _used_ to work, but was
broken by 5f0fc64513 (fetch-pack: eliminate spurious error messages,
2012-09-09). Which only changed the fetch-pack side. It moved the
handling of --all so that it was no longer in the "else" for
check_refname_format(). I guess the original code was rejecting those
peeled bits as "not a ref" (which makes sense).
So that seems like a bug in fetch-pack. But I'm still not convinced that
upload-pack doesn't also have a bug.
> +test_expect_failure 'test --all wrt tag to non-commits' '
> + blob_sha1=$(echo "hello blob" | git hash-object -t blob -w --stdin) &&
> + git tag -a -m "tag -> blob" tag-to-blob $blob_sha1 &&
> + tree_sha1=$(echo -e "100644 blob $blob_sha1\tfile" | git mktree) &&
I had to switch this "echo -e" to:
printf "100644 blob $blob_sha1\tfile\n"
since "-e" is a bash-ism (and my /bin/sh is dash).
-Peff
next prev parent reply other threads:[~2018-06-11 4:20 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-10 14:32 [PATCH] fetch-pack: demonstrate --all breakage when remote have tags to non-commit objects Kirill Smelkov
2018-06-11 4:20 ` Jeff King [this message]
2018-06-11 4:47 ` [PATCH] fetch-pack: don't try to fetch peeled values with --all Jeff King
2018-06-11 5:28 ` Eric Sunshine
2018-06-11 5:53 ` [PATCH v2] fetch-pack: don't try to fetch peel " Jeff King
2018-06-11 9:43 ` Kirill Smelkov
2018-06-12 9:48 ` Jeff King
2018-06-12 18:54 ` Kirill Smelkov
2018-06-13 11:18 ` [PATCH] fetch-pack: test explicitly that --all can fetch tag references pointing to non-commits Kirill Smelkov
2018-06-13 17:42 ` Junio C Hamano
2018-06-13 18:43 ` Kirill Smelkov
2018-06-13 21:05 ` Jeff King
2018-06-13 23:11 ` Jeff King
2018-06-14 5:25 ` Kirill Smelkov
2018-06-14 16:07 ` Junio C Hamano
2018-06-14 17:51 ` Kirill Smelkov
2018-06-13 12:55 ` [PATCH] fetch-pack: demonstrate --all failure when remote is empty Kirill Smelkov
2018-06-13 17:13 ` Junio C Hamano
2018-06-13 18:21 ` Kirill Smelkov
2018-06-13 21:13 ` [PATCH v2] fetch-pack: don't try to fetch peel values with --all Jeff King
2018-06-14 5:29 ` Kirill Smelkov
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=20180611042016.GA31642@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=kirr@nexedi.com \
--cc=tikuta@chromium.org \
/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).