git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Arno Gourdol <arno.gourdol@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Issue with commit a2b26ff "fsck: convert gitmodules url to URL passed to curl"
Date: Mon, 11 May 2020 15:49:30 -0400	[thread overview]
Message-ID: <20200511194930.GA10545@coredump.intra.peff.net> (raw)
In-Reply-To: <8F92F354-BBDD-4629-98D4-A67E0A865397@gmail.com>

On Mon, May 11, 2020 at 11:02:24AM -0700, Arno Gourdol wrote:

> This change introduced stricter validation and checking of the .gitmodules file.
> 
> The problem is that I had an invalid URL in my .gitmodules file (an extra "/" in "http://“):
> 
> ```
> [submodule "packages/website/assets/tecendil-js"]
>     path = packages/website/assets/tecendil-js
>     url = https:///github.com/arnog/tecendil-js.git
>     branch = master
> ```

Yeah, I agree that would be blocked by the recent fsck changes you
found.

> However, I cannot commit a fix to this, as it gets rejected because
> the current .gitmodules is invalid. As a result I can no longer push
> commits to my repo.

Was the broken .gitmodules already pushed up? If so, then the push
fixing it shouldn't need to send the bad object, and should be allowed.
Though you need to make sure you aren't pushing up any intermediate
trees with the broken state, either (i.e., you can't push up the fix on
top of some other changes; the fix has to come first).

If it wasn't already pushed up, then you should be able to fix via "git
rebase -i" or similar. That will rewrite history, but the history hasn't
been shared with anyone else by pushing, it shouldn't be a big deal.

> (PS: I have attempted to contact GitHub about this, but haven’t heard back)

Hopefully one of the suggestions above should lead to a resolution. But
in the worst case they can relax the fsck restrictions temporarily to
get a fix pushed up.

-Peff

      reply	other threads:[~2020-05-11 19:49 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-11 18:02 Issue with commit a2b26ff "fsck: convert gitmodules url to URL passed to curl" Arno Gourdol
2020-05-11 19:49 ` Jeff King [this message]

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=20200511194930.GA10545@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=arno.gourdol@gmail.com \
    --cc=git@vger.kernel.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.
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).