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

Can no longer reset submodule changes in the super project's commit window. #5937

Closed
Tagette opened this issue Dec 17, 2018 · 7 comments · Fixed by #6002
Closed

Can no longer reset submodule changes in the super project's commit window. #5937

Tagette opened this issue Dec 17, 2018 · 7 comments · Fixed by #6002
Assignees
Labels
type: bug 🐛 type: regression regression, normally to latest official release
Milestone

Comments

@Tagette
Copy link

Tagette commented Dec 17, 2018

When I try to reset submodule changes from the super projects commit window, it does not reset anything.

  1. Make changes in a child submodule.
  2. Go to the super project's commit window.
  3. Right click the submodule change and click "Reset submodule changes".
  4. Notice how the changes were not reset.

This bug may require that you only have "new file" changes in the submodule.

  • GitExtensions version: 3.00.00
  • GIT version: 2.20.1
  • OS version: Windows 10
  • .NET version: Windows 10

This works in git extensions 2.51.05.

@Tagette Tagette changed the title Can no longer reset submodule changes in the parent module's commit window. Can no longer reset submodule changes in the super project's commit window. Dec 17, 2018
@vbjay
Copy link
Contributor

vbjay commented Dec 17, 2018

Works
image

Works
image

Fails to delete new files even if Also delete new files checked
image
image

@vbjay
Copy link
Contributor

vbjay commented Dec 17, 2018

Workaround is to select commit submodule changes and then in the new dialog, reset in the current dialog and then close the dialog. Then continue with main repo actions.

@gerhardol
Copy link
Member

As vbjay showed, this only affects new files not being deleted. This occurred both in the Commit dialog and in revisiondiff (WorkingTree artificial commit).

Please test the updated build in https://ci.appveyor.com/project/gitextensions/gitextensions/builds/21261432

@RussKie
Copy link
Member

RussKie commented Dec 28, 2018

Submodules reset/update has always left me utterly confused... Looking forward to a fix.

@gerhardol
Copy link
Member

commit|reset|stash submodule changes
All are done in the context of the submodule, same as if you opened the submodule and applied the command there.

Update submodule is different, it is changing the commit from the current repo (superproject).
A separator could be added in the context menus.

@RussKie
Copy link
Member

RussKie commented Dec 28, 2018 via email

@vbjay
Copy link
Contributor

vbjay commented Dec 28, 2018

image

We could use ahead/back status to tell the user they are on the same commit and there are changes in the working directory (0 ahead, 0 back). They can always get more details by right clicking and clicking commit submodule details. That tells you if there are working directory changes.

@gerhardol gerhardol modified the milestones: 3.1.0, 3.0.1 Dec 28, 2018
@ghost ghost removed the status: ready label Jan 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: bug 🐛 type: regression regression, normally to latest official release
Projects
None yet
Development

Successfully merging a pull request may close this issue.

4 participants