<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<p>Hi Stefan,</p>
<p>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!<br>
</p>
<p>
<blockquote type="cite">using pre-commit hook, to stop a commit,</blockquote>
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.</p>
<p>
<blockquote type="cite">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.</blockquote>
I agree. I've added an issue to implement this behavior [1].<br>
</p>
<p>[1] <a class="moz-txt-link-freetext" href="https://github.com/oxygenxml/Oxygen-Git-Plugin/issues/35">https://github.com/oxygenxml/Oxygen-Git-Plugin/issues/35</a><br>
</p>
<pre class="moz-signature" cols="72">Best regards,
Alex
--
Alex Jitianu
<oXygen/> XML Editor, Schema Editor and XSLT Editor/Debugger
<a class="moz-txt-link-freetext" href="http://www.oxygenxml.com">http://www.oxygenxml.com</a> </pre>
<div class="moz-cite-prefix">On 9/18/2017 5:06 PM, Stefan Eike
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:726898857.11201.1505743590936@office.mailbox.org">
<meta charset="UTF-8">
<p>Hi Alex,<br>
</p>
<p>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.<br>
</p>
<p>Cheers,<br>
Stefan<br>
</p>
<p><br>
</p>
<blockquote type="cite">Alex Jitianu <a class="moz-txt-link-rfc2396E" href="mailto:alex_jitianu@sync.ro"><alex_jitianu@sync.ro></a>
hat am 18. September 2017 um 15:40 geschrieben:<br>
<br>
<p>Hi Tony,</p>
<p>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 <strong>Help->Check for add-ons updates...</strong>
and follow the update procedure.</p>
<p>If you have any other feedback please do not hesitate to tell
us.<br>
</p>
<pre class="ox-0b25353372-moz-signature">Best regards,
Alex
--
Alex Jitianu
<oXygen/> XML Editor, Schema Editor and XSLT Editor/Debugger
<a class="ox-0b25353372-moz-txt-link-freetext" href="http://www.oxygenxml.com" moz-do-not-send="true">http://www.oxygenxml.com</a> </pre>
<div class="ox-0b25353372-moz-cite-prefix">On 9/15/2017 12:52
PM, Tony Graham wrote:<br>
</div>
<blockquote type="cite">On 22/08/2017 09:36, Alex Jitianu wrote:
<br>
<blockquote type="cite">Those of you that are using Git might
be interested to know that <br>
there is a new Git plugin for Oxygen [1]. <br>
</blockquote>
<br>
I installed version 1.1.6, thank you. <br>
<br>
I have an oXygen project that has a Git repository with a
submodule, <br>
where the submodule has work done in it that has been
committed and <br>
pushed fairly often but the parent project hasn't been touched
for a while. <br>
<br>
By some combination of events, when I configured the Git
plugin to use <br>
the Git repository, the submodule was switched to '(no
branch)' and with <br>
contents seemingly corresponding to the last time that the
parent <br>
project was committed. <br>
<br>
Quite apart from the confusion that this caused, it also lost
some <br>
changes in the submodule that had not yet been committed. <br>
<br>
Regards, <br>
<br>
<br>
Tony Graham. <br>
</blockquote>
<br>
</blockquote>
<p><br>
</p>
<blockquote type="cite">_______________________________________________<br>
oXygen-user mailing list<br>
<a class="moz-txt-link-abbreviated" href="mailto:oXygen-user@oxygenxml.com">oXygen-user@oxygenxml.com</a><br>
<a class="moz-txt-link-freetext" href="https://www.oxygenxml.com/mailman/listinfo/oxygen-user">https://www.oxygenxml.com/mailman/listinfo/oxygen-user</a><br>
</blockquote>
</blockquote>
<br>
</body>
</html>