ingydotnet/git-subrepo

Can't commit: ... doesn't contain upstream HEAD

friscote opened this issue · 1 comments

Can someone please help resolving the issue with 'Can't commit: ... doesn't contain upstream HEAD'. Basically, I cannot push, each time I try to push, I get this error. When I run 'git subrepo status', I can see that I have a correct ref to my remote. It is exactly the same issue as mentioned here (there are steps to reproduce): https://app.bountysource.com/issues/96954870-git-subrepo-push-fails-with-can-t-commit-mysubrepodir-doesn-t-contain-upstream-head-even-after-clean-pull the biggest issue I have, when I pull from the remote, some of my files (paths) get modified, even though in the remote they are not modified. I have to revert them back manually, but on the next pull they get rewritten again. Can someone please help with this?

Hi, I'm just commenting to let you know that I have the same issue. I didn't figure out why yet.

$ git subrepo version
git-subrepo Version: 0.4.5
Copyright 2013-2020 Ingy döt Net
https://github.com/ingydotnet/git-subrepo
C:\my_path_to_anonymized\git-subrepo\lib\git-subrepo
Git Version: 2.35.1.windows.2

My two cents is that it is related to this issue: #539 ; the .gitrepo file would be not updated properly so our sha1 in this file doesn't point to the HEAD of the branch.