From: Stefan Beller <firstname.lastname@example.org> To: Jonathan Nieder <email@example.com> Cc: Junio C Hamano <firstname.lastname@example.org>, git <email@example.com> Subject: Re: [PATCH] git-submodule.sh: try harder to fetch a submodule Date: Fri, 11 May 2018 16:42:29 -0700 Message-ID: <CAGZ79kYcOgBM_XQRidsB-T2V+vfuiG5rrNKTvhHYwzPs3mF4qA@mail.gmail.com> (raw) In-Reply-To: <20180511232840.GB41222@aiede.svl.corp.google.com> On Fri, May 11, 2018 at 4:28 PM, Jonathan Nieder <firstname.lastname@example.org> wrote: > Hi, > > Stefan Beller wrote: > >> This is the logical continuum of fb43e31f2b4 (submodule: try harder to >> fetch needed sha1 by direct fetching sha1, 2016-02-23) and fixes it as >> some assumptions were not correct. > > Interesting. > > I think what would help most is an example set of commands I can use > to reproduce this (bonus points if in the form of a test). I tried coming up with a test in git-core that produces a remote similar to Gerrit, and let me tell you, it's not Git that is weird here. ;) >> > If $sha1 was not part of the default fetch ... fail ourselves here >> assumes that the fetch_in_submodule only fails when the serverside does > > I'm having some trouble with the formatting here. Is the part > preceded by '>' a quote, and if so a quote from what? The quote is from fb43e31f2b4. >> There are other failures, why such a fetch may fail, such as >> fatal: Couldn't find remote ref HEAD >> which can happen if the remote side doesn't advertise HEAD. Not advertising > > nit: it can be useful to have a blank line before and after such > example output to help both my eyes and tools like "git log > --format='%w(100)%b'" to understand the formatting. Why would you use this formatting? > >> HEAD is allowed by the protocol spec and would happen, if HEAD points at a >> ref, that this user cannot see (due to ACLs for example). > > A more typical example would be if the ref simply doesn't exist (i.e., > is a branch yet to be born). Oh, I checked that but not for the submodule case, let me check that. >> diff --git a/git-submodule.sh b/git-submodule.sh >> index 24914963ca2..13b378a6c8f 100755 >> --- a/git-submodule.sh >> +++ b/git-submodule.sh >> @@ -614,7 +614,6 @@ cmd_update() >> # is not reachable from a ref. >> is_tip_reachable "$sm_path" "$sha1" || >> fetch_in_submodule "$sm_path" $depth || > > Is keeping the '||' at the end of this line intended? yes, as we only want to run the code below if there was some error. >> - die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")" >> >> # Now we tried the usual fetch, but $sha1 may >> # not be reachable from any of the refs >> is_tip_reachable "$sm_path" "$sha1" || >> fetch_in_submodule "$sm_path" $depth "$sha1" || >> die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain \$sha1. Direct fetching of that commit failed.")" > > Should this error message be changed? I don't think so?
next prev parent reply index Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-11 23:17 Stefan Beller 2018-05-11 23:28 ` Jonathan Nieder 2018-05-11 23:42 ` Stefan Beller [this message] 2018-05-12 0:03 ` Junio C Hamano 2018-05-15 19:07 ` Stefan Beller 2018-05-15 19:40 ` Stefan Beller 2018-05-15 20:04 ` Jonathan Nieder 2018-05-15 20:00 [PATCHv2 0/3] Reroll of sb/submodule-merge-in-merge-recursive Stefan Beller 2018-05-15 20:00 ` [PATCH] git-submodule.sh: try harder to fetch a submodule Stefan Beller
Reply instructions: You may reply publically 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=CAGZ79kYcOgBM_XQRidsB-T2V+vfuiG5rrNKTvhHYwzPs3mF4qA@mail.gmail.com \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.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
email@example.com mailing list mirror (one of many) Archives are clonable: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.org/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ or Tor2web: https://www.tor2web.org/ AGPL code for this site: git clone https://public-inbox.org/ public-inbox