<div dir="ltr"><div><div><div>Hi,<br><br></div></div>To get the correct commit of a submodule (as VTKm), you need to run `git submodule update` in the VTK directory.<br><br></div>Nicolas<br></div><div class="gmail_extra"><br><div class="gmail_quote">2018-05-26 2:22 GMT+02:00 Andrew Maclean <span dir="ltr"><<a href="mailto:andrew.amaclean@gmail.com" target="_blank">andrew.amaclean@gmail.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I have been noticing that when running git status the following message arises in relation to vtk-m<div class="gmail_default" style="font-size:small;display:inline">​ </div>(Windows 10 and Linux)<div class="gmail_default" style="font-size:small;display:inline">​.​</div><br><div class="gmail_default" style="font-size:small"><span style="font-family:monospace"><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">Changes not staged for commit:
</span><br>  (use "git add <file>..." to update what will be committed)
<br>  (use "git checkout -- <file>..." to discard changes in working directory)
<br>
<br>        <span style="color:rgb(178,24,24);background-color:rgb(255,255,255)">modified:   ThirdParty/vtkm/vtk-m</span><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)"> (new commits)</span><br>
<br></span>Running a diff reveals:</div><div class="gmail_default" style="font-size:small"><span style="font-family:monospace"><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">$ git diff ThirdParty/vtkm/vtk-m
</span><br><span style="font-weight:bold;color:rgb(0,0,0);background-color:rgb(255,255,255)">diff --git a/ThirdParty/vtkm/vtk-m b/ThirdParty/vtkm/vtk-m</span><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">
</span><br><span style="font-weight:bold;color:rgb(0,0,0);background-color:rgb(255,255,255)">index 7cf0926172..6a908cc9da 160000</span><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">
</span><br><span style="font-weight:bold;color:rgb(0,0,0);background-color:rgb(255,255,255)">--- a/ThirdParty/vtkm/vtk-m</span><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">
</span><br><span style="font-weight:bold;color:rgb(0,0,0);background-color:rgb(255,255,255)">+++ b/ThirdParty/vtkm/vtk-m</span><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">
</span><br><span style="color:rgb(24,178,178);background-color:rgb(255,255,255)">@@ -1 +1 @@</span><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">
</span><br><span style="color:rgb(178,24,24);background-color:rgb(255,255,255)">-Subproject commit 7cf09261725ce848514185420b94e0<wbr>d5655ec4fa</span><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">
</span><br><span style="color:rgb(24,178,24);background-color:rgb(255,255,255)">+Subproject commit 6a908cc9da6076a42d41b9397ad71f<wbr>56a1f69a70</span><br><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">
</span><br></span>So I do:</div><div class="gmail_default" style="font-size:small"><span style="font-family:monospace"><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">$ git checkout -- ThirdParty/vtkm/vtk-m</span><br></span><span style="font-family:monospace"><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">$ git pull --rebase</span><br></span> <span style="font-family:monospace"><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">Already up to date.
</span><br>Current branch master is up to date.<br></span></div><div class="gmail_default"><span style="font-size:small;font-family:monospace"><span style="font-family:monospace"><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)">$ git status
</span><br>On branch master
<br>Your branch is up to date with 'origin/master'.
<br>
<br>Changes not staged for commit:
<br>  (use "git add <file>..." to update what will be committed)
<br>  (use "git checkout -- <file>..." to discard changes in working directory)
<br>
<br>        <span style="color:rgb(178,24,24);background-color:rgb(255,255,255)">modified:   ThirdParty/vtkm/vtk-m</span><span style="color:rgb(0,0,0);background-color:rgb(255,255,255)"> (new commits)</span><br>
<br></span></span>Is there an extra step that I have to do in relation to vtk-m now?  <br><br>Thanks<span class="HOEnZb"><font color="#888888"><br>   Andrew<span style="font-size:small;font-family:monospace"><br></span></font></span></div><span class="HOEnZb"><font color="#888888"><div><br></div>-- <br><div dir="ltr" class="m_4765735394672055674gmail_signature" data-smartmail="gmail_signature">______________________________<wbr>_____________<br>Andrew J. P. Maclean<br><br>______________________________<wbr>_____________</div></font></span></div>
<br>______________________________<wbr>_________________<br>
Powered by <a href="http://www.kitware.com" rel="noreferrer" target="_blank">www.kitware.com</a><br>
<br>
Visit other Kitware open-source projects at <a href="http://www.kitware.com/opensource/opensource.html" rel="noreferrer" target="_blank">http://www.kitware.com/<wbr>opensource/opensource.html</a><br>
<br>
Search the list archives at: <a href="http://markmail.org/search/?q=vtk-developers" rel="noreferrer" target="_blank">http://markmail.org/search/?q=<wbr>vtk-developers</a><br>
<br>
Follow this link to subscribe/unsubscribe:<br>
<a href="https://vtk.org/mailman/listinfo/vtk-developers" rel="noreferrer" target="_blank">https://vtk.org/mailman/<wbr>listinfo/vtk-developers</a><br>
<br>
<br></blockquote></div><br></div>