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

tests: force checkout of submodules #4079

Merged
1 commit merged into from Mar 21, 2015

Conversation

Projects
None yet
3 participants
@ghost

ghost commented Mar 18, 2015

When updating submodules, always checkout even if the HEAD is the
desired commit hash (update --force) to avoid the following:

* a directory gmock exists in hammer
* a submodule gmock replaces the directory gmock in master
* checkout master + submodule update : gmock/.git is created
* checkout hammer : the gmock directory still contains the .git from
  master because it did not exist at the time and checkout won't
  remove untracked directories
* checkout master + submodule update : git rev-parse HEAD is
  at the desired commit although the content of the gmock directory
  is from hammer

http://tracker.ceph.com/issues/11157 Fixes: #11157

Signed-off-by: Loic Dachary ldachary@redhat.com

doc,tests: force checkout of submodules
When updating submodules, always checkout even if the HEAD is the
desired commit hash (update --force) to avoid the following:

    * a directory gmock exists in hammer
    * a submodule gmock replaces the directory gmock in master
    * checkout master + submodule update : gmock/.git is created
    * checkout hammer : the gmock directory still contains the .git from
      master because it did not exist at the time and checkout won't
      remove untracked directories
    * checkout master + submodule update : git rev-parse HEAD is
      at the desired commit although the content of the gmock directory
      is from hammer

http://tracker.ceph.com/issues/11157 Fixes: #11157

Signed-off-by: Loic Dachary <ldachary@redhat.com>

@ghost ghost added bug fix core labels Mar 18, 2015

@ghost ghost assigned dzafman Mar 18, 2015

@ghost ghost added this to the firefly milestone Mar 18, 2015

@loic-bot

This comment has been minimized.

loic-bot commented Mar 19, 2015

SUCCESS: run-make-check.sh on centos-7 (no output because pastebinit failed)

:octocat: Sent from GH.

ghost pushed a commit that referenced this pull request Mar 21, 2015

Merge pull request #4079 from dachary/wip-11157-firefly
doc,tests: force checkout of submodules

Reviewed-by: David Zafman <dzafman@redhat.com>

@ghost ghost merged commit 15acfe7 into ceph:firefly Mar 21, 2015

@ghost ghost changed the title from doc,tests: force checkout of submodules to tests: force checkout of submodules Jul 14, 2015

This issue was closed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment