Skip to content

Commit 5199fb2

Browse files
committed
enhance: do NOT remember the last selected handling method of uncommitted local changes (#977)
Signed-off-by: leo <[email protected]>
1 parent c90b7af commit 5199fb2

File tree

4 files changed

+9
-27
lines changed

4 files changed

+9
-27
lines changed

src/Models/RepositorySettings.cs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ public bool IncludeUntrackedInLocalChanges
5050
set;
5151
} = true;
5252

53-
public DealWithLocalChanges DealWithLocalChangesOnCheckoutBranch
54-
{
55-
get;
56-
set;
57-
} = DealWithLocalChanges.DoNothing;
58-
5953
public bool EnableForceOnFetch
6054
{
6155
get;
@@ -68,12 +62,6 @@ public bool FetchWithoutTags
6862
set;
6963
} = false;
7064

71-
public DealWithLocalChanges DealWithLocalChangesOnPull
72-
{
73-
get;
74-
set;
75-
} = DealWithLocalChanges.DoNothing;
76-
7765
public bool PreferRebaseInsteadOfMerge
7866
{
7967
get;
@@ -116,12 +104,6 @@ public bool PushToRemoteWhenDeleteTag
116104
set;
117105
} = false;
118106

119-
public DealWithLocalChanges DealWithLocalChangesOnCreateBranch
120-
{
121-
get;
122-
set;
123-
} = DealWithLocalChanges.DoNothing;
124-
125107
public bool CheckoutBranchOnCreateBranch
126108
{
127109
get;

src/ViewModels/Checkout.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ public string Branch
1111

1212
public Models.DealWithLocalChanges PreAction
1313
{
14-
get => _repo.Settings.DealWithLocalChangesOnCheckoutBranch;
15-
set => _repo.Settings.DealWithLocalChangesOnCheckoutBranch = value;
16-
}
14+
get;
15+
set;
16+
} = Models.DealWithLocalChanges.DoNothing;
1717

1818
public Checkout(Repository repo, string branch)
1919
{

src/ViewModels/CreateBranch.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ public object BasedOn
2121

2222
public Models.DealWithLocalChanges PreAction
2323
{
24-
get => _repo.Settings.DealWithLocalChangesOnCreateBranch;
25-
set => _repo.Settings.DealWithLocalChangesOnCreateBranch = value;
26-
}
24+
get;
25+
set;
26+
} = Models.DealWithLocalChanges.DoNothing;
2727

2828
public bool CheckoutAfterCreated
2929
{

src/ViewModels/Pull.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ public Models.Branch SelectedBranch
4040

4141
public Models.DealWithLocalChanges PreAction
4242
{
43-
get => _repo.Settings.DealWithLocalChangesOnPull;
44-
set => _repo.Settings.DealWithLocalChangesOnPull = value;
45-
}
43+
get;
44+
set;
45+
} = Models.DealWithLocalChanges.DoNothing;
4646

4747
public bool UseRebase
4848
{

0 commit comments

Comments
 (0)