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.

Sign up for GitHub

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
Open

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5e36970
enumerate diff lines in patch changeset.
igadmg Mar 31, 2020
d522310
rebase with submodules fixed.
igadmg Apr 6, 2020
0041df5
added Common.props
igadmg Apr 10, 2020
d3893f0
Merge github.com:libgit2/libgit2sharp
igadmg Apr 25, 2020
d8ab449
Exception is thrown if file path is passed as remote to Commands.Fetch
igadmg Apr 25, 2020
8967743
In case of reabese of repository with submodules, submodules are left…
igadmg Apr 25, 2020
2dc649e
Added SubmoduleUpdateOptions to rebase options.
igadmg Jun 4, 2020
64f6962
Update RebaseOptions.cs
igadmg Jun 9, 2020
691f705
Merge branch 'master' of github.com:yatagarasu25/libgit2sharp
igadmg Dec 17, 2020
b0aae85
Merge branch 'master' of github.com:libgit2/libgit2sharp
igadmg Dec 17, 2020
697dadc
Merge branch 'master' of github.com:yatagarasu25/libgit2sharp
igadmg Dec 17, 2020
997fbb2
Merge branch 'master' of github.com:yatagarasu25/libgit2sharp
igadmg Dec 17, 2020
12d28e4
update.
igadmg Dec 17, 2020
e4eaa4e
Update on Command.Pull but it does not work as expected actually.
igadmg Dec 17, 2020
11b3c9b
update.
igadmg Dec 17, 2020
d240985
update.
igadmg Dec 17, 2020
3a8ca30
Merge D:\workspace\libgit2sharp
igadmg Dec 17, 2020
85a21cb
Merge D:\workspace\libgit2sharp
igadmg Dec 17, 2020
b36c410
update.
igadmg Jan 29, 2021
4c7ca57
Merge D:\workspace\GitKeeper\libgit2sharp
igadmg Oct 15, 2021
45df744
Update to netstandard 2.1
igadmg Oct 15, 2021
9b58d4c
Merge remote-tracking branch 'fork/master'
igadmg Mar 10, 2022
1053623
fixed for net472
igadmg Mar 10, 2022
4ff7a44
Update LibGit2Sharp.NativeBinaries to 2.0.315
bording Apr 1, 2022
e097d0b
React to ABI changes
bording Apr 2, 2022
d79fd3b
update
igadmg Jun 14, 2022
0492494
update
igadmg Jun 14, 2022
683880f
update
igadmg Jun 14, 2022
63541e4
Merge remote-tracking branch 'fork/libgit2-update'
igadmg Jun 14, 2022
4eea28e
update
igadmg Jun 14, 2022
158ff02
Merge remote-tracking branch 'fork/libgit2-update'
igadmg Jun 14, 2022
87f6eea
update
igadmg Jun 14, 2022
80ffa03
Merge branch 'master' of github.com:yatagarasu25/libgit2sharp
igadmg Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions LibGit2Sharp/Rebase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 •
edited
Loading

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.


RebaseResult rebaseResult = RebaseOperationImpl.Run(rebaseOperationHandle,
this.repository,
committer,
Expand Down
7 changes: 7 additions & 0 deletions LibGit2Sharp/SubmoduleCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@ public virtual void Init(string name, bool overwrite)
}
}


public virtual void UpdateAll(SubmoduleUpdateOptions options)
Copy link

@AraHaan AraHaan Jun 9, 2020 •
edited
Loading

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.

{
foreach (var sm in this)
Update(sm.Name, options);
}

/// <summary>
/// Update specified submodule.
/// <para>
Expand Down