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.

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

Push from empty FormCommit #9008

Merged
merged 1 commit into from Mar 19, 2021

Conversation

mstv
Copy link
Member

@mstv mstv commented Mar 17, 2021

Fixes #7179

Proposed changes

  • Turn Commit & push button of FormCommit into &Push if there are no changes at all
  • Move translated string &Push from FormPush to TranslatedStrings
  • Remove repeated type from new in TranslatedStrings

Screenshots

Before

grafik
grafik

After

grafik

grafik

Test methodology

  • manual

Test environment(s)

  • Git Extensions 33.33.33
  • Build b7931b6
  • Git 2.27.0.windows.1 (recommended: 2.30.0 or later)
  • Microsoft Windows NT 10.0.19042.0
  • .NET Framework 4.8.4300.0
  • DPI 96dpi (no scaling)

✒️ I contribute this code under The Developer Certificate of Origin.

@mstv mstv self-assigned this Mar 17, 2021
Copy link
Member

@gerhardol gerhardol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have not run

GitUI/CommandsDialogs/FormCommit.cs Outdated Show resolved Hide resolved
@@ -2698,6 +2701,12 @@ private void editFileToolStripMenuItem_Click(object sender, EventArgs e)

private void CommitAndPush_Click(object sender, EventArgs e)
{
if (CommitAndPush.Text == _push.Text)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Slightly suspicious to compare texts, but it is the easiest way to achieve this...

Copy link
Member Author

@mstv mstv Mar 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what I thought, too.

@RussKie RussKie added 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity type: translation changed labels Mar 18, 2021
@ghost ghost removed the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Mar 18, 2021
@mstv
Copy link
Member Author

mstv commented Mar 18, 2021

I have reused the translation from FormPush and rebased.

@RussKie RussKie merged commit b4c133d into gitextensions:master Mar 19, 2021
@ghost ghost added this to the 3.6 milestone Mar 19, 2021
@mstv mstv deleted the feature/7179_commit_push branch March 21, 2021 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow "Push" on commit dialog even if there are no changes.
3 participants