-
Notifications
You must be signed in to change notification settings - Fork 271
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Can't commit: 'subrepo/xxxxxx' doesn't contain upstream HEAD: yyyyyy (again, sorry) #632
Comments
Here's the result of
|
Closing this because it adds nothing compared to #602. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I'm aware that this class of error has been reported multiple times, but I keep running into it so I'm sure I'm doing something wrong. I have tried to create a minimal repro, but it works fine there, which is vexing. Luckily all my repos are public which might help with debugging.
I have a project repository, which is here: https://github.com/n3dst4/gumshoe-fvtt
Inside it, under
packages/shared-fvtt-bits
, is a subrepo clone of some stuff I reuse between projects: https://github.com/n3dst4/shared-fvtt-bitsThe
shared-fvtt-bits
repo/subrepo gets commited to directly and via my project repo (and potentially other projects using it as a subrepo). I believe that this is a reasonable use-case for subrepo, right? So Im expecting to see merge commits, and occasionally having to deal with conflicts.git subrepo pull packages/shared-fvtt-bits
usually seems to work fine.Every time I attempt to
git subrepo push packages/shared-fvtt-bits
I get theCan't commit: 'subrepo/xxxxxx' doesn't contain upstream HEAD: yyyyyy
error.I have not rewritten history on my main branch. I have also not rewritten history in the shared repo.
The
.gitrepo
file after a successful pull looks like:The
commit
hashb6db2c1a6c1523fc6af5121e2ffa6bca0714c732
is indeed the correct, real hash of the HEAD ofshared-fvtt-bits
.The
parent
hash2a49ef8d9fd8579b7cce16a1be14f1afd6c2de40
is the hash of the most recent commit on mymain
branch before the last time time I successfully pulled (that time, I was in a hurry so I just force-pushed the subrepo - this time I'm asking for help!)The exact error I'm seeing is:
Question: after a successful
git subrepo pull
, what shouldparent
andcommit
be pointing to?Edit: I also note that after the error, looking at the branch that
subrepo
has created, the hashes of the most recent commits from the shared repo are all wrong, as if they've been rebased. The HEAD commit of the shared repo (b6db2c...
) is now60956...
for example.The text was updated successfully, but these errors were encountered: