-
Bug
-
Resolution: Fixed
-
High
-
1.6.2.1
-
None
-
None
SourceTree v1.6.2.1 on Mac OSX v10.8.3
Interactive Rebase works well in non-git-submodule repositories, but when I try to do so on a git-submodule repository, it errors out:
git -c diff.mnemonicprefix=false -c core.quotepath=false -c sequence.editor='/Users/jeff/Applications/SourceTree.app/Contents/Resources/stree_gri' -c core.editor='/Users/jeff/Applications/SourceTree.app/Contents/Resources/stree_gri' rebase -i --autosquash
Could not execute editor
A dialog box with a text edit box labeled "Enter commit message" appears, and although I do not know what happens if I were to input something, clicking the dialog "Commit" button without any input text then gives me the following:
git -c diff.mnemonicprefix=false -c core.quotepath=false -c sequence.editor='/Users/jeff/Applications/SourceTree.app/Contents/Resources/stree_gri' -c core.editor='/Users/jeff/Applications/SourceTree.app/Contents/Resources/stree_gri' rebase -i --autosquash
Rebasing (17/17)
Successfully rebased and updated refs/heads/dev.
Completed successfully
No changes are made to the git repository as expected, but no interactive rebase dialog as I did hope for.
You can (hopefully!) reproduce this bug by cloning a copy of the TTcards repository at https://github.com/i8degrees/ttcards and attempting to interactively rebase any of the git-submodules – json_spirit, nomJSON, gamelib. Note that it (should) work inside the base repository (TTcards).
Thank you for your efforts,
Jeff
P.S. I find little reason to use the git command line now with this new feature :-D
| Form Name | |||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
[SRCTREE-1698] Interactive Rebase Bug On a Submodule
ksenior I still got the error after cancelling interactive rebase window in a submodule:
git -c diff.mnemonicprefix=false -c core.quotepath=false -c "sequence.editor='C:\Program Files (x86)\Atlassian\SourceTree\stree_gri'" -c "core.editor='C:\Program Files (x86)\Atlassian\SourceTree\stree_gri'" rebase -i --autosquash xxxxxxxxxxxxxxxxxxxxxxxxxxxx Could not execute editor Completed with errors, see above.
Version 1.6.13.0
OS: Windows 8.1
Hi Javier,
So that Git checkout isn't a submodule of any other repository whatsoever? I need to take a deeper look into why the problem is happening on submodules, but so far we've not had the same problem happen on regular repositories.
I'm taking a look into this issue today so hopefully will report back shortly.
Cheers
Javier Fernandez
added a comment - I am experiencing this same symptoms on a regular git checkout. Additionally, they are intermittent, with no intervening changes to the git config:
git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree -c sequence.editor='/Applications/SourceTree.app/Contents/Resources/stree_gri' -c core.editor='/Applications/SourceTree.app/Contents/Resources/stree_gri' rebase -i --autosquash db97f78e74ec347609e0f524407b9da25255749c,
followed by the commit message prompt.
This is on 1.6.3.1 on git 1.7.12.4.
By the way, awesome product!
Javier Fernandez
added a comment - I am experiencing this same symptoms on a regular git checkout. Additionally, they are intermittent, with no intervening changes to the git config:
git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree -c sequence.editor='/Applications/SourceTree.app/Contents/Resources/stree_gri' -c core.editor='/Applications/SourceTree.app/Contents/Resources/stree_gri' rebase -i --autosquash db97f78e74ec347609e0f524407b9da25255749c,
followed by the commit message prompt.
This is on 1.6.3.1 on git 1.7.12.4.
By the way, awesome product! i8degrees Actually, I've just realised you're saying this happens when you try an interactive rebase purely on a submodule. Can you confirm this is the problem? So you're saying it works fine if the submodule was a regular repository, but if it's a submodule it fails?
Hi Jeff,
I've just tested this myself without any problems. The 'could not execute editor' happens when you cancel the prompt, which is interesting.
Have you tested this against 1.6.3.1? If not, could you try to do so? Looking at your output it should just work fine. It's GRI itself not opening causing it to return error output.
Could I have a copy of your git config? I'm thinking you've got some options set in there causing it not to execute our editor.
Cheers
[oops, actually I am on windows.]
Me too.
Sourcetree 1.16.14.0
git -c diff.mnemonicprefix=false -c core.quotepath=false -c "sequence.editor='C:\Program Files (x86)\Atlassian\SourceTree\stree_gri'" -c "core.editor='C:\Program Files (x86)\Atlassian\SourceTree\stree_gri'" rebase -i --autosquash
Could not execute editor
Completed with errors, see above.