Skip to content

Commit 691f705

Browse files
committed
Merge branch 'master' of github.com:yatagarasu25/libgit2sharp
2 parents d8ab449 + 64f6962 commit 691f705

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

Diff for: LibGit2Sharp/Rebase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ internal virtual RebaseResult Start(ReferenceHandle annotatedRefPtr, ReferenceHa
169169
ontoRefAnnotatedCommitHandle,
170170
gitRebaseOptions))
171171
{
172-
this.repository.Submodules.UpdateAll(new SubmoduleUpdateOptions());
172+
this.repository.Submodules.UpdateAll(options.SubmoduleUpdateOptions);
173173

174174
RebaseResult rebaseResult = RebaseOperationImpl.Run(rebaseOperationHandle,
175175
this.repository,

Diff for: LibGit2Sharp/RebaseOptions.cs

+5
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ public sealed class RebaseOptions : IConvertableToGitCheckoutOpts
4141
/// </summary>
4242
public CheckoutFileConflictStrategy FileConflictStrategy { get; set; }
4343

44+
/// <summary>
45+
/// Submodule update options passed to submodule updates on rebase step.
46+
/// </summary>
47+
public SubmoduleUpdateOptions SubmoduleUpdateOptions { get; set; }
48+
4449
CheckoutCallbacks IConvertableToGitCheckoutOpts.GenerateCallbacks()
4550
{
4651
return CheckoutCallbacks.From(OnCheckoutProgress, OnCheckoutNotify);

Diff for: LibGit2Sharp/SubmoduleCollection.cs

+2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ public virtual void Init(string name, bool overwrite)
7373

7474
public virtual void UpdateAll(SubmoduleUpdateOptions options)
7575
{
76+
options = options ?? new SubmoduleUpdateOptions();
77+
7678
foreach (var sm in this)
7779
Update(sm.Name, options);
7880
}

0 commit comments

Comments
 (0)