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

Feature/i11054 clean submodules #11101

Merged

Conversation

NatRavenhill
Copy link
Contributor

@NatRavenhill NatRavenhill commented Jul 13, 2023

Fixes #11054

Proposed changes

  • Add "Clean submodules recursively" option
  • When checked, the command "git submodule foreach --recursive git clean" will be ran after "git clean", with the same arguments

Screenshots

Before

image

After

image

Test methodology

  • Tested with a couple of local projects
  • Added a unit test in the GitCommands unit tests

Test environment(s)

  • GIT 2.41.0.windows.1
  • Windows 10

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).


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

@ghost ghost assigned NatRavenhill Jul 13, 2023
@NatRavenhill NatRavenhill marked this pull request as ready for review July 14, 2023 18:05
Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

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

👍

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.

preview is not handled in Preview_Click()
I suggest that is added too

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.

@NatRavenhill and @scottsumrall can you agree how to merge the Designer changes?

@scottsumrall
Copy link
Contributor

@NatRavenhill and @scottsumrall can you agree how to merge the Designer changes?

I'm fairly new to this but happy to give it a shot. Would it possibly be easier to just revert my designer and modify based on what @NatRavenhill has? The UI wasn't particularly difficult to implement in the first place. Seems like merging the designer files could be problematic but it's not something I've really messed with before.

@gerhardol
Copy link
Member

@NatRavenhill and @scottsumrall can you agree how to merge the Designer changes?

I'm fairly new to this but happy to give it a shot. Would it possibly be easier to just revert my designer and modify based on what @NatRavenhill has? The UI wasn't particularly difficult to implement in the first place. Seems like merging the designer files could be problematic but it's not something I've really messed with before.

The PR that goes second need to rebase on master using the Designer file from master and then manually reapply changes. Not so hard but often feeling like a waste of time. But hard to avoid here.
But if @scottsumrall is OK with it, we can merge this PR first.

@scottsumrall
Copy link
Contributor

@NatRavenhill and @scottsumrall can you agree how to merge the Designer changes?

I'm fairly new to this but happy to give it a shot. Would it possibly be easier to just revert my designer and modify based on what @NatRavenhill has? The UI wasn't particularly difficult to implement in the first place. Seems like merging the designer files could be problematic but it's not something I've really messed with before.

The PR that goes second need to rebase on master using the Designer file from master and then manually reapply changes. Not so hard but often feeling like a waste of time. But hard to avoid here.

But if @scottsumrall is OK with it, we can merge this PR first.

Works for me

@gerhardol
Copy link
Member

Pushed a change for ArgumentString as well as for using common code for preview/execute.
Plan to merge tomorrow so #11102 can be rebased and merged.

@RussKie RussKie merged commit 5a11dfd into gitextensions:master Jul 22, 2023
4 checks passed
@ghost ghost added this to the vNext milestone Jul 22, 2023
@RussKie
Copy link
Member

RussKie commented Jul 22, 2023

Thank you all

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add option to clean submodules
4 participants