Mark Waite edited a comment on Bug JENKINS-22510

I've been trying to understand the sequence of git operations which arrive at that state, and haven't yet understood them. My attempts have persuaded me that I don't understand submodules. I used my fork of the git-client-plugin for my experiments.

Clone the repository

git clone git://github.com/MarkEWaite/git-client-plugin
cd git-client-plugin
ls modules/ntp # reports an error, no content in modules/ntp

Checkout tests/getSubmodules

git checkout tests/getSubmodules
git submodule update --init --recursive
ls modules/ntp # Shows there is content in modules/ntp

Checkout master again

git checkout master # warns there are untracked files in modules directory
ls modules/ntp # shows content in modules/ntp is still there

git clean -xfd # skips modules/ntp and modules/firewall
ls modules/ntp # shows content in modules/ntp is still there

git clean -xffd # deletes modules/ntp and modules/firewall
ls modules/ntp # no content in modules/ntp

Checkout branch containing a conflicting file - works

git checkout tests/notSubmodules
ls modules/ntp # one file in modules/ntp

Checkout tests/getSubmodules again

git checkout tests/getSubmodules
git submodule update --init --recursive

Checkout branch containing a conflicting file - fails

git checkout tests/notSubmodules # fails - untracked files would be overwritten

Unfortunately, I've not yet found a sequence of "clean" and "checkout" commands which will allow me to switch from tests/getSubmodules to tests/notSubmodules.

This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators.
For more information on JIRA, see: http://www.atlassian.com/software/jira

--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to