Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upGitHub is where the world builds software
Millions of developers and companies build, ship, and maintain their software on GitHub — the largest and most advanced development platform in the world.
In case of reabese of repository with submodules, submodules are left… #1788
Conversation
… in non updatred state and prevent rebase from continuing. Fixed that by updating submodules after rebase was initialized.
LibGit2Sharp/Rebase.cs
Outdated
| @@ -119,6 +119,8 @@ public virtual RebaseResult Start(Branch branch, Branch upstream, Branch onto, I | |||
| ontoRefAnnotatedCommitHandle, | |||
| gitRebaseOptions)) | |||
| { | |||
| this.repository.Submodules.UpdateAll(new SubmoduleUpdateOptions()); | |||
AraHaan
Jun 3, 2020
•
I would like it as an optional parameter so we can override if it we want to pls.
I would like it as an optional parameter so we can override if it we want to pls.
yatagarasu25
Jun 4, 2020
Author
What exactly you want to override here? AFAIK without that line rebase will not be possible to make.
What exactly you want to override here? AFAIK without that line rebase will not be possible to make.
AraHaan
Jun 4, 2020
I am saying extract the new SubmoduleUpdateOptions() to an optional param that you pass into UpdateAll.
I am saying extract the new SubmoduleUpdateOptions() to an optional param that you pass into UpdateAll.
yatagarasu25
Jun 4, 2020
Author
Ok, got it. Added them to RebaseOptions, i think that is most appropriate place.
Ok, got it. Added them to RebaseOptions, i think that is most appropriate place.
LibGit2Sharp/RebaseOptions.cs
Outdated
| @@ -41,6 +41,11 @@ public sealed class RebaseOptions : IConvertableToGitCheckoutOpts | |||
| /// </summary> | |||
| public CheckoutFileConflictStrategy FileConflictStrategy { get; set; } | |||
|
|
|||
| /// <summary> | |||
| /// Submodule update options passed to submodule updates on rtebase step. | |||
AraHaan
Jun 5, 2020
•
typo on rebase?
typo on rebase?
| @@ -70,6 +70,15 @@ public virtual void Init(string name, bool overwrite) | |||
| } | |||
| } | |||
|
|
|||
|
|
|||
| public virtual void UpdateAll(SubmoduleUpdateOptions options) | |||
AraHaan
Jun 9, 2020
•
SubmoduleCollection.cs(74,29): error CS1591: Missing XML comment for publicly visible type or member 'SubmoduleCollection.UpdateAll(SubmoduleUpdateOptions)' [/home/vsts/work/1/s/LibGit2Sharp/LibGit2Sharp.csproj]
This is making the build status fail. I noticed this afterwards.
SubmoduleCollection.cs(74,29): error CS1591: Missing XML comment for publicly visible type or member 'SubmoduleCollection.UpdateAll(SubmoduleUpdateOptions)' [/home/vsts/work/1/s/LibGit2Sharp/LibGit2Sharp.csproj]This is making the build status fail. I noticed this afterwards.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
… in non updatred state and prevent rebase from continuing.
Fixed that by updating submodules after rebase was initialized.