git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Philippe Blain <levraiphilippeblain@gmail.com>
To: Eddie Ridwan <eddie.ridwan@gmail.com>, git@vger.kernel.org
Subject: Re: Git push subtree fail unknown revision or path possibly due to missing git-subtree-split commit
Date: Thu, 7 Oct 2021 21:14:36 -0400	[thread overview]
Message-ID: <efdf8b7e-b568-cb13-eb07-346dc9ca4f49@gmail.com> (raw)
In-Reply-To: <CANcBuaZmRj3tZqprNwjJatJ87F0vUVDKDRm5+OnOk_z3wqvJYg@mail.gmail.com>

Hi Eddie

[we reply inline on this mailing list, see below :)]

Le 2021-10-07 à 02:00, Eddie Ridwan a écrit :
> Hi Philippe
> 
> Using the debug option (see attached file), I see that the git push
> subtree command is complaining that many commits are in the wrong
> order.
> 

Indeed, the attachment shows many messages like:

progress: 1/     131 (0) [0]
Processing commit: 1fbbdda4f0ef15794eeb4a343d3fb1bf17fbb853
   parents: c75f7cab156c91a1bf3b36658e1ac94dd1905bba
     incorrect order: c75f7cab156c91a1bf3b36658e1ac94dd1905bba


> Any idea how this could happen? And is there any way to recover from this?

I'm not a 'git subtree' user myself, so really don't know unfortunately.

> 
> Would it be best to just delete the subtree and start again?

You could do that. If you do want to debug further, I would suggest
searching the mailing list (see https://lore.kernel.org/git/_/text/help/)
for recent contributors to 'contrib/subtree' and CC-ing them. Maybe they
will be able to provide more insight here.

You also asked on Stack Overflow if you should try to delete the subtree
cache. I think this could be something to try (I would guess if it's called
a cache, it should be recreated). But again I'm not a 'git subtree' user.

> 
> Many thanks
> 
> Eddie Ridwan

Cheers,

Philippe.

      parent reply	other threads:[~2021-10-08  1:14 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-05  4:53 Git push subtree fail unknown revision or path possibly due to missing git-subtree-split commit Eddie Ridwan
2021-10-07  2:52 ` Philippe Blain
2021-10-07  5:43   ` Eddie Ridwan
     [not found]     ` <CANcBuaZmRj3tZqprNwjJatJ87F0vUVDKDRm5+OnOk_z3wqvJYg@mail.gmail.com>
2021-10-08  1:14       ` Philippe Blain [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=efdf8b7e-b568-cb13-eb07-346dc9ca4f49@gmail.com \
    --to=levraiphilippeblain@gmail.com \
    --cc=eddie.ridwan@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).