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

Prepopulate branch name in FormCreateBranch #7916

Merged
1 commit merged into from Apr 7, 2020

Conversation

mstv
Copy link
Member

@mstv mstv commented Mar 29, 2020

Proposed changes

  • prepopulate the branch name in FormCreateBranch with the first branch or tag at the current revision
    It can be replaced easily because the whole string is selected.

My use case:
I often create temporary copies of branches before rebasing, squashing or fetching force-pushed branches. I don't want to search the ref log.

Screenshots

Before

grafik

After

grafik

Test methodology

  • manual

Test environment(s)

  • Git Extensions 3.3.0
  • Build d6096c4
  • Git 2.24.1.windows.2
  • Microsoft Windows NT 6.2.9200.0
  • .NET Framework 4.8.4121.0
  • DPI 96dpi (no scaling)

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

@mstv mstv self-assigned this Mar 29, 2020
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.

Works fine

@RussKie
Copy link
Member

RussKie commented Mar 30, 2020

Could you please provide rationale behind this FR?

@RussKie RussKie added the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Mar 30, 2020
@gerhardol
Copy link
Member

When you want save a test/temp commit on what you are working on or you want to save a temp branch before a rebase (easier to find than using reflog or a tag).
I will use this several times a week.

@vbjay
Copy link
Contributor

vbjay commented Mar 30, 2020 via email

@gerhardol
Copy link
Member

Instead just commit with wip in subject

I use that as well as stash (should name them though). It all depends on what I am doing, how the changes are expected to be useful and if they can be merged or not.
At work, often xml files are changed that normally cannot be merged at all, often cannot be diffed either where WIP is impossible.

@mstv
Copy link
Member Author

mstv commented Mar 30, 2020

Could you please provide rationale behind this FR?

From issue description:

My use case:
I often create temporary copies of branches before rebasing, squashing or fetching force-pushed branches. I don't want to search the ref log.

@ghost ghost removed the 📭 needs: author feedback More info/confirmation awaited from OP; issues typically get closed after 30 days of inactivity label Mar 30, 2020
@vbjay
Copy link
Contributor

vbjay commented Mar 30, 2020 via email

@mstv
Copy link
Member Author

mstv commented Mar 30, 2020

You still must give it a name. Extending the current branch (or tag) is a good default IMO.
I often enough abort. Though if there are merge conflicts, it is good to be able to compare everything afterwards. I often have plenty of merge conflicts when updating modules with project-specific configuration.

@mstv
Copy link
Member Author

mstv commented Apr 6, 2020

@msftbot merge in 1 day

@ghost ghost added the status: auto merge label Apr 6, 2020
@ghost
Copy link

ghost commented Apr 6, 2020

Hello @mstv!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I won't merge this pull request until after the UTC date Tue, 07 Apr 2020 22:22:18 GMT, which is in 1 day

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

@ghost ghost merged commit 6218afb into gitextensions:master Apr 7, 2020
@ghost ghost added this to the 4.0 milestone Apr 7, 2020
@mstv mstv deleted the feature/branch_name branch April 8, 2020 20:56
This pull request was closed.
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.

None yet

4 participants