Skip to content
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

In case of reabese of repository with submodules, submodules are left… #1788

Open
wants to merge 33 commits into
base: master
Choose a base branch
from

Conversation

igadmg
Copy link

@igadmg igadmg commented Apr 25, 2020

… in non updatred state and prevent rebase from continuing.

Fixed that by updating submodules after rebase was initialized.

@@ -119,6 +119,8 @@ public virtual RebaseResult Start(Branch branch, Branch upstream, Branch onto, I
ontoRefAnnotatedCommitHandle,
gitRebaseOptions))
{
this.repository.Submodules.UpdateAll(new SubmoduleUpdateOptions());
Copy link

@AraHaan AraHaan Jun 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like it as an optional parameter so we can override if it we want to pls.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What exactly you want to override here? AFAIK without that line rebase will not be possible to make.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am saying extract the new SubmoduleUpdateOptions() to an optional param that you pass into UpdateAll.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, got it. Added them to RebaseOptions, i think that is most appropriate place.

@@ -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.
Copy link

@AraHaan AraHaan Jun 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo on rebase?

@@ -70,6 +70,15 @@ public virtual void Init(string name, bool overwrite)
}
}


public virtual void UpdateAll(SubmoduleUpdateOptions options)
Copy link

@AraHaan AraHaan Jun 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@AraHaan
Copy link

AraHaan commented Jan 20, 2021

@yatagarasu25 the build still fails because missing docs on that publicly visible member.

@AraHaan
Copy link

AraHaan commented Jan 20, 2021

@yatagarasu25 I just opened a pr to your fork to fix this pr.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants