Skip to content

Commit dc6d426

Browse files
author
Nathan Roe
committed
Fixed return result of plugin execute method,
Changed dialog to not close after a pull button click to allow for a work flow to rebase and then push
1 parent 8c6df2c commit dc6d426

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

GitTfsDialog.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ private void PullButtonClick(object sender, EventArgs e)
8282
_settings.PullSetting = PullSetting.Fetch;
8383
_commands.StartGitTfsCommandProcessDialog("fetch", TfsRemoteComboBox.Text);
8484
}
85-
this.Close();
8685
}
8786

8887
private void InitializePush()

GitTfsPlugin.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,19 @@ public bool Execute(GitUIBaseEventArgs gitUiCommands)
3131
{
3232
if (string.IsNullOrEmpty(gitUiCommands.GitWorkingDir))
3333
{
34-
return false;
34+
return true;
3535
}
3636

3737
var remotes = GetTfsRemotes(gitUiCommands.GitUICommands);
3838

3939
if (remotes.Any())
4040
{
4141
new GitTfsDialog(gitUiCommands.GitUICommands, PluginSettings, remotes).ShowDialog();
42-
}
43-
else
44-
{
45-
MessageBox.Show("The active repository has no TFS remotes.", "git-tfs Error",
46-
MessageBoxButtons.OK, MessageBoxIcon.Error);
42+
return false;
4743
}
4844

45+
MessageBox.Show("The active repository has no TFS remotes.", "git-tfs Error",
46+
MessageBoxButtons.OK, MessageBoxIcon.Error);
4947
return true;
5048
}
5149

0 commit comments

Comments
 (0)