From: Kirill Smelkov <kirr@nexedi.com>
To: Jeff King <peff@peff.net>
Cc: Eric Sunshine <sunshine@sunshineco.com>,
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>,
Michael Haggerty <mhagger@alum.mit.edu>,
Git List <git@vger.kernel.org>
Subject: Re: [PATCH v2] fetch-pack: don't try to fetch peel values with --all
Date: Mon, 11 Jun 2018 09:43:02 +0000 [thread overview]
Message-ID: <20180611094255.GA15563@deco.navytux.spb.ru> (raw)
In-Reply-To: <20180611055357.GA16430@sigill.intra.peff.net>
Jeff,
On Mon, Jun 11, 2018 at 01:53:57AM -0400, Jeff King wrote:
> On Mon, Jun 11, 2018 at 01:28:23AM -0400, Eric Sunshine wrote:
>
> > On Mon, Jun 11, 2018 at 12:47 AM, Jeff King <peff@peff.net> wrote:
> > > Subject: fetch-pack: don't try to fetch peeled values with --all
> > > [...]
> > > Original report and test from Kirill Smelkov.
> > >
> > > Signed-off-by: Kirill Smelkov <kirr@nexedi.com>
> > > Signed-off-by: Jeff King <peff@peff.net>
> > > ---
> > > diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
> > > @@ -506,30 +506,45 @@ test_expect_success 'test missing ref before existing' '
> > > +test_expect_success '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=$(printf "100644 blob $blob_sha1\tfile\n" | git mktree) &&
> >
> > Perhaps modernize these names to 'blob_oid' and 'tree_oid', or even
> > simpler, just 'blob' and 'tree'.
>
> Looking deeper, we do not need these trees and blobs at all. The problem
> is really just a tag that peels to an object that is not otherwise a ref
> tip, regardless of its type.
Thanks for feedback and for coming up with the fix. Sure, I'm ok with
moving the test into your patch. However, even if a test becomes
different - narrowing down root of _current_ problem, I suggest to also
keep explicitly testing tag-to-blob and tag-to-tree (and if we really
also want tag-to-commit and tag-to-tag) behaviour. Reason is: if we skip
those now, they can potentially break in the future.
I would also suggest to fix upload-pack, as it is just not consistent to
reject sending objects that were advertised, and so can strike again
some way in the future. After all git.git's fetch-pack is not the only
git client that should be possible to interact with git.git's
upload-pack on remote side, right?
By the way, another problem I noticed with fetch-pack is that fetching
with --all from completely empty repository also fails:
.../r$ git init --bare repo.git
Initialized empty Git repository in /home/kirr/tmp/trashme/r/repo.git/
.../r$ mkdir clone
.../r$ cd clone/
.../r/clone$ git init
Initialized empty Git repository in /home/kirr/tmp/trashme/r/clone/.git/
.../r/clone$ git fetch-pack --all ../repo.git/
fatal: no matching remote head
.../r/clone$ echo $?
128
.../r/clone$ git ls-remote ../repo.git/
.../r/clone$ echo $?
0
.../r/clone$ git fetch ../repo.git/ 'refs/*:refs/repo/*'
.../r/clone$ echo $?
0
I'm not sure, but I would say that `fetch-pack --all` from an empty
repository should not fail and should just give empty output as fetch
does.
For the reference all the cases presented here are real - they appear in
our repositories on lab.nexedi.com for which I maintain the backup, and
I've noticed them in the process of switching git-backup from using
fetch to fetch-pack here:
https://lab.nexedi.com/kirr/git-backup/blob/0ab7bbb6/git-backup.go#L436
Kirill
> So below is a patch that simplifies the test even further (the actual
> code change is the same).
>
> > > + git tag -a -m "tag -> tree" tag-to-tree $tree_sha1 &&
> > > + mkdir fetchall &&
> > > + (
> > > + cd fetchall &&
> > > + git init &&
> > > + git fetch-pack --all .. &&
> >
> > Simpler:
> >
> > git init fetchall &&
> > (
> > cd fetchall &&
> > git fetch-pack --all .. &&
> >
> > Although, I see that this script already has a mix of the two styles
> > (simpler and not-so-simple), so...
>
> The nearby tests actually reuse the "client" directory. We can do that,
> too, if we simply create new objects for our test, to make sure they
> still need fetching. See below (we could also use "git -C" there, but
> the subshell matches the other tests).
>
> -- >8 --
> Subject: fetch-pack: don't try to fetch peel values with --all
>
> When "fetch-pack --all" sees a tag-to-blob on the remote, it
> tries to fetch both the tag itself ("refs/tags/foo") and the
> peeled value that the remote advertises ("refs/tags/foo^{}").
> Asking for the object pointed to by the latter can cause
> upload-pack to complain with "not our ref", since it does
> not mark the peeled objects with the OUR_REF (unless they
> were at the tip of some other ref).
>
> Arguably upload-pack _should_ be marking those peeled
> objects. But it never has in the past, since clients would
> generally just ask for the tag and expect to get the peeled
> value along with it. And that's how "git fetch" works, as
> well as older versions of "fetch-pack --all".
>
> The problem was introduced by 5f0fc64513 (fetch-pack:
> eliminate spurious error messages, 2012-09-09). Before then,
> the matching logic was something like:
>
> if (refname is ill-formed)
> do nothing
> else if (doing --all)
> always consider it matched
> else
> look through list of sought refs for a match
>
> That commit wanted to flip the order of the second two arms
> of that conditional. But we ended up with:
>
> if (refname is ill-formed)
> do nothing
> else
> look through list of sought refs for a match
>
> if (--all and no match so far)
> always consider it matched
>
> That means tha an ill-formed ref will trigger the --all
> conditional block, even though we should just be ignoring
> it. We can fix that by having a single "else" with all of
> the well-formed logic, that checks the sought refs and
> "--all" in the correct order.
>
> Reported-by: Kirill Smelkov <kirr@nexedi.com>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> fetch-pack.c | 8 ++++----
> t/t5500-fetch-pack.sh | 10 ++++++++++
> 2 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/fetch-pack.c b/fetch-pack.c
> index a320ce9872..cc7a42fee9 100644
> --- a/fetch-pack.c
> +++ b/fetch-pack.c
> @@ -657,11 +657,11 @@ static void filter_refs(struct fetch_pack_args *args,
> }
> i++;
> }
> - }
>
> - if (!keep && args->fetch_all &&
> - (!args->deepen || !starts_with(ref->name, "refs/tags/")))
> - keep = 1;
> + if (!keep && args->fetch_all &&
> + (!args->deepen || !starts_with(ref->name, "refs/tags/")))
> + keep = 1;
> + }
>
> if (keep) {
> *newtail = ref;
> diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
> index d4f435155f..5726f83ea3 100755
> --- a/t/t5500-fetch-pack.sh
> +++ b/t/t5500-fetch-pack.sh
> @@ -518,6 +518,16 @@ test_expect_success 'test --all, --depth, and explicit tag' '
> ) >out-adt 2>error-adt
> '
>
> +test_expect_success 'test --all with tag to non-tip' '
> + git commit --allow-empty -m non-tip &&
> + git commit --allow-empty -m tip &&
> + git tag -m "annotated" non-tip HEAD^ &&
> + (
> + cd client &&
> + git fetch-pack --all ..
> + )
> +'
> +
> test_expect_success 'shallow fetch with tags does not break the repository' '
> mkdir repo1 &&
> (
> --
> 2.18.0.rc1.446.g4486251e51
next prev parent reply other threads:[~2018-06-11 9:58 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
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 [this message]
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=20180611094255.GA15563@deco.navytux.spb.ru \
--to=kirr@nexedi.com \
--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=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.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).