Hi Stefan,
Thank you for providing more insight into the submodule feature. As
you've probably guessed, we haven't worked that much with them so any
help is most welcomed!
using pre-commit hook, to stop a commit,
From the plugin's point of view, I guess we can make this check from
the code of the plugin, when the user presses the Commit button. Having
a pre-commit hook, though, will ensure this situation will be caught no
matter which client you use.
However Oxygen should warn, that the head is detached and ask the user
to pick a branch, because that's what he always wants. But Oxygen
should not checkout a random branch, because that would also lead to
unexpected results. If something else is meant here, please excuse to
make you read this text.
I agree. I've added an issue to implement this behavior [1].
[1] https://github.com/oxygenxml/Oxygen-Git-Plugin/issues/35
Best regards,
Alex
--
Alex Jitianu
<oXygen/> XML Editor, Schema Editor and XSLT Editor/Debugger
http://www.oxygenxml.com
On 9/18/2017 5:06 PM, Stefan Eike wrote:
Hi Alex,
I have not tested this, but read this mail. Just to make sure: It's
wanted (but annoying) behavior, that a submodule always points to a
commit hash and not to a branch. So it's a common and wanted (but
annoying) situation, that submodules fall in a detached head state. To
avoid this, I'd recommend using pre-commit hook, to stop a commit, if
there is not branch checked out. Otherwise the Oxygen Git Client would
work diffently than the Git CLI client. This may lead to unexpected
results. However Oxygen should warn, that the head is detached and ask
the user to pick a branch, because that's what he always wants. But
Oxygen should not checkout a random branch, because that would also
lead to unexpected results. If something else is meant here, please
excuse to make you read this text.
Cheers,
Stefan
Alex Jitianu <alex_jiti...@sync.ro> hat am 18. September 2017 um
15:40 geschrieben:
Hi Tony,
Thank you for reporting this issue and I'm sorry for the headache...
We've released a new version that fixes this bug. You can go to
*Help->Check for add-ons updates...* and follow the update procedure.
If you have any other feedback please do not hesitate to tell us.
Best regards,
Alex
--
Alex Jitianu
<oXygen/> XML Editor, Schema Editor and XSLT Editor/Debugger
http://www.oxygenxml.com
On 9/15/2017 12:52 PM, Tony Graham wrote:
On 22/08/2017 09:36, Alex Jitianu wrote:
Those of you that are using Git might be interested to know that
there is a new Git plugin for Oxygen [1].
I installed version 1.1.6, thank you.
I have an oXygen project that has a Git repository with a submodule,
where the submodule has work done in it that has been committed and
pushed fairly often but the parent project hasn't been touched for a
while.
By some combination of events, when I configured the Git plugin to use
the Git repository, the submodule was switched to '(no branch)' and
with
contents seemingly corresponding to the last time that the parent
project was committed.
Quite apart from the confusion that this caused, it also lost some
changes in the submodule that had not yet been committed.
Regards,
Tony Graham.
_______________________________________________
oXygen-user mailing list
oXygen-user@oxygenxml.com
https://www.oxygenxml.com/mailman/listinfo/oxygen-user
_______________________________________________
oXygen-user mailing list
oXygen-user@oxygenxml.com
https://www.oxygenxml.com/mailman/listinfo/oxygen-user
