Clear error when rebase has broken parent reference#415
Open
OskiKervinen-MF wants to merge 2 commits intoingydotnet:masterfrom
Open
Clear error when rebase has broken parent reference#415OskiKervinen-MF wants to merge 2 commits intoingydotnet:masterfrom
OskiKervinen-MF wants to merge 2 commits intoingydotnet:masterfrom
Conversation
Collaborator
|
I like the error message change, but #407 does a better job fixing the submodule issue. |
…HEAD Before, there would be a cryptic error about invalid parameters, because prev_commit would never get set. This situation can occur when the commit that last touched the subrepo has been rebased.
Moved the parent verification inside the branch that actually depends on the parent. Without that it fails needlessly when there is no parent yet.
OskiKervinen-MF
force-pushed
the
topic/clear-error-on-dishinheritance
branch
from
c8788f2 to
f261515
Compare
Contributor
Author
|
I removed the part that touched the submodule issue. The remaining test failures seem to equal those in master. |
|
I've accidentally rebased after doing a subrepo push/pull a few times and then getting weird failures the next time I try to update. Having a meaningful error message would be really useful. |
|
I found a potential fix for this issue here: #617 |
admorgan
added a commit
to admorgan/git-subrepo
that referenced
this pull request
Jul 11, 2024
I did not find it immediately obvious how to gather the information needed to fix a missing parent error. Search the repository for the values needed and present them as part of the message. Fixes ingydotnet#617, ingydotnet#415, ingydotnet#600
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I had rebased the commit where I performed the
git subrepoclone and when I tried to do apullafter that, I received the errorI was able to figure out this was because of the rebase eventually, but it took some doing, so I made this MR to make the problem obvious in the future.
Also replaced one raw reference to .git with an invocation of
git rev-parse --git-dir.