Skip to content

Commit b9d7f90

Browse files
committed
refactor: do NOT use the --prune parameter for git fetch command (#590)
1 parent 077e35b commit b9d7f90

File tree

13 files changed

+7
-27
lines changed

13 files changed

+7
-27
lines changed

src/Commands/Fetch.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace SourceGit.Commands
44
{
55
public class Fetch : Command
66
{
7-
public Fetch(string repo, string remote, bool prune, bool noTags, Action<string> outputHandler)
7+
public Fetch(string repo, string remote, bool noTags, Action<string> outputHandler)
88
{
99
_outputHandler = outputHandler;
1010
WorkingDirectory = repo;
@@ -13,9 +13,6 @@ public Fetch(string repo, string remote, bool prune, bool noTags, Action<string>
1313
SSHKey = new Config(repo).Get($"remote.{remote}.sshkey");
1414
Args = "fetch --progress --verbose ";
1515

16-
if (prune)
17-
Args += "--prune ";
18-
1916
if (noTags)
2017
Args += "--no-tags ";
2118
else

src/Resources/Locales/de_DE.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,6 @@
243243
<x:String x:Key="Text.Fetch" xml:space="preserve">Fetch</x:String>
244244
<x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">Alle Remotes fetchen</x:String>
245245
<x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Ohne Tags fetchen</x:String>
246-
<x:String x:Key="Text.Fetch.Prune" xml:space="preserve">Alle verwaisten Branches entfernen</x:String>
247246
<x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Remote:</x:String>
248247
<x:String x:Key="Text.Fetch.Title" xml:space="preserve">Remote-Änderungen fetchen</x:String>
249248
<x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">Als unverändert annehmen</x:String>

src/Resources/Locales/en_US.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@
247247
<x:String x:Key="Text.Fetch" xml:space="preserve">Fetch</x:String>
248248
<x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">Fetch all remotes</x:String>
249249
<x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Fetch without tags</x:String>
250-
<x:String x:Key="Text.Fetch.Prune" xml:space="preserve">Prune remote dead branches</x:String>
251250
<x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Remote:</x:String>
252251
<x:String x:Key="Text.Fetch.Title" xml:space="preserve">Fetch Remote Changes</x:String>
253252
<x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">Assume unchanged</x:String>

src/Resources/Locales/fr_FR.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@
229229
<x:String x:Key="Text.Fetch" xml:space="preserve">Fetch</x:String>
230230
<x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">Fetch toutes les branches distantes</x:String>
231231
<x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Fetch sans les tags</x:String>
232-
<x:String x:Key="Text.Fetch.Prune" xml:space="preserve">Élaguer les branches mortes distantes</x:String>
233232
<x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Remote :</x:String>
234233
<x:String x:Key="Text.Fetch.Title" xml:space="preserve">Récupérer les changements distants</x:String>
235234
<x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">Présumer inchangé</x:String>

src/Resources/Locales/pt_BR.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@
225225
<x:String x:Key="Text.Fetch" xml:space="preserve">Buscar</x:String>
226226
<x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">Buscar todos os remotos</x:String>
227227
<x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Buscar sem tags</x:String>
228-
<x:String x:Key="Text.Fetch.Prune" xml:space="preserve">Prune remotos mortos</x:String>
229228
<x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Remoto:</x:String>
230229
<x:String x:Key="Text.Fetch.Title" xml:space="preserve">Buscar Alterações Remotas</x:String>
231230
<x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">Assumir não alterado</x:String>

src/Resources/Locales/ru_RU.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@
251251
<x:String x:Key="Text.Fetch" xml:space="preserve">Извлечь</x:String>
252252
<x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">Извлечь все внешние хранилища</x:String>
253253
<x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Извлечь без меток</x:String>
254-
<x:String x:Key="Text.Fetch.Prune" xml:space="preserve">Удалить внешние мёртвые ветки</x:String>
255254
<x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Внешнее хранилище:</x:String>
256255
<x:String x:Key="Text.Fetch.Title" xml:space="preserve">Извлечь внешние изменения</x:String>
257256
<x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">Допустить без изменений</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@
250250
<x:String x:Key="Text.Fetch" xml:space="preserve">拉取(fetch)</x:String>
251251
<x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">拉取所有的远程仓库</x:String>
252252
<x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">不拉取远程标签</x:String>
253-
<x:String x:Key="Text.Fetch.Prune" xml:space="preserve">自动清理远程已删除分支</x:String>
254253
<x:String x:Key="Text.Fetch.Remote" xml:space="preserve">远程仓库 :</x:String>
255254
<x:String x:Key="Text.Fetch.Title" xml:space="preserve">拉取远程仓库内容</x:String>
256255
<x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">不跟踪此文件的更改</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@
250250
<x:String x:Key="Text.Fetch" xml:space="preserve">提取 (fetch)</x:String>
251251
<x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">提取所有的遠端存放庫</x:String>
252252
<x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">不提取遠端標籤</x:String>
253-
<x:String x:Key="Text.Fetch.Prune" xml:space="preserve">自動清理遠端已刪除分支</x:String>
254253
<x:String x:Key="Text.Fetch.Remote" xml:space="preserve">遠端存放庫:</x:String>
255254
<x:String x:Key="Text.Fetch.Title" xml:space="preserve">提取遠端存放庫內容</x:String>
256255
<x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">不追蹤此檔案的變更</x:String>

src/ViewModels/AddRemote.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public override Task<bool> Sure()
100100
{
101101
SetProgressDescription("Fetching from added remote ...");
102102
new Commands.Config(_repo.FullPath).Set($"remote.{_name}.sshkey", _useSSH ? SSHKey : null);
103-
new Commands.Fetch(_repo.FullPath, _name, true, false, SetProgressDescription).Exec();
103+
new Commands.Fetch(_repo.FullPath, _name, false, SetProgressDescription).Exec();
104104
}
105105
CallUIThread(() =>
106106
{

src/ViewModels/Fetch.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ public Models.Remote SelectedRemote
2222
set;
2323
}
2424

25-
public bool Prune
26-
{
27-
get;
28-
set;
29-
} = true;
30-
3125
public bool NoTags
3226
{
3327
get => _repo.Settings.FetchWithoutTags;
@@ -53,13 +47,13 @@ public override Task<bool> Sure()
5347
foreach (var remote in _repo.Remotes)
5448
{
5549
SetProgressDescription($"Fetching remote: {remote.Name}");
56-
new Commands.Fetch(_repo.FullPath, remote.Name, Prune, NoTags, SetProgressDescription).Exec();
50+
new Commands.Fetch(_repo.FullPath, remote.Name, NoTags, SetProgressDescription).Exec();
5751
}
5852
}
5953
else
6054
{
6155
SetProgressDescription($"Fetching remote: {SelectedRemote.Name}");
62-
new Commands.Fetch(_repo.FullPath, SelectedRemote.Name, Prune, NoTags, SetProgressDescription).Exec();
56+
new Commands.Fetch(_repo.FullPath, SelectedRemote.Name, NoTags, SetProgressDescription).Exec();
6357
}
6458

6559
CallUIThread(() =>

0 commit comments

Comments
 (0)