[Paraview-developers] New git repo: reporting changed repo after only pull

Francois Bertel francois.bertel at kitware.com
Tue Apr 20 10:24:46 EDT 2010


Note: the --recursive argument for submodule has been introduced in git 1.6.5.

ref: http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.txt


On Tue, Apr 20, 2010 at 9:07 AM, Dave Partyka <dave.partyka at kitware.com> wrote:
> You're going to want to add something like this in your script for initial
> checkout:
>   execute_process(
>     COMMAND \"${CTEST_GIT_COMMAND}\" submodule init
>     WORKING_DIRECTORY \"${CTEST_SOURCE_DIRECTORY}\"
>     )
> And for each update you'll want:
>   execute_process(
>     COMMAND \"${CTEST_GIT_COMMAND}\" submodule update --recursive --
>     WORKING_DIRECTORY \"${CTEST_SOURCE_DIRECTORY}\"
>     )
> Also this will be handy:
> # Look for a GIT command-line client.
> if(NOT DEFINED CTEST_GIT_COMMAND)
> find_program(CTEST_GIT_COMMAND NAMES git git.cmd)
> endif()
> On Mon, Apr 19, 2010 at 7:16 PM, Dave Partyka <dave.partyka at kitware.com>
> wrote:
>>
>> I do not know if ctest knows how to update submodules automatically. I
>> have it on my todo list to talk to Brad King about this for the same reason
>> for updating the ParaView dashboards here at Kitware. I'll share what I find
>> out.
>>
>> On Mon, Apr 19, 2010 at 7:13 PM, Moreland, Kenneth <kmorel at sandia.gov>
>> wrote:
>>>
>>> Yes.  That seems to fix the problem.  However, is there a way to get
>>> ctest to run that after pulling?  Otherwise we’ll still get a bunch of
>>> errors in the dashboard.
>>>
>>> -Ken
>>>
>>>
>>> On 4/19/10 5:09 PM, "Dave Partyka" <dave.partyka at kitware.com> wrote:
>>>
>>> does 'git submodule update' help?
>>>
>>> On Mon, Apr 19, 2010 at 7:02 PM, Moreland, Kenneth <kmorel at sandia.gov>
>>> wrote:
>>>
>>> I noticed something odd when converting to the new git repositories
>>> today.  After only cloning the repository, setting up the modules, and then
>>> pulling (using the --rebase flag as described on the Wiki), status reports
>>> that I have made a change in my repository even though I have not.  Here is
>>> a terminal capture of a newly cloned ParaView repository (after modules and
>>> hooks are set up).
>>>
>>> kmorel2 0> git status
>>>                                /Users/kmorel/src/ParaView
>>> # On branch master
>>> nothing to commit (working directory clean)
>>> kmorel2 1> git pull --rebase
>>>                         /Users/kmorel/src/ParaView
>>> remote: Counting objects: 44, done.
>>> remote: Compressing objects: 100% (26/26), done.
>>> remote: Total 26 (delta 20), reused 0 (delta 0)
>>> Unpacking objects: 100% (26/26), done.
>>> From git://paraview.org/ParaView <http://paraview.org/ParaView>
>>>    c880593..c5f3c07  master     -> origin/master
>>> First, rewinding head to replay your work on top of it...
>>> Fast-forwarded master to c5f3c079ec12a1a85526a56e40147ded8089b7f0.
>>> kmorel2 0> git status
>>>                                /Users/kmorel/src/ParaView
>>> # On branch master
>>> # Changed but not updated:
>>> #   (use "git add <file>..." to update what will be committed)
>>> #   (use "git checkout -- <file>..." to discard changes in working
>>> directory)
>>> #
>>> #       modified:   VTK
>>> #
>>> no changes added to commit (use "git add" and/or "git commit -a")
>>> kmorel2 1>
>>>                                           /Users/kmorel/src/ParaView
>>>
>>> Does anyone have a clue why git is reporting VTK as modified or how to
>>> fix it?  I first noticed this as I was testing my dashboards and saw that
>>> update was reporting errors.
>>>
>>> -Ken
>>>
>>>    ****      Kenneth Moreland
>>>     ***      Sandia National Laboratories
>>> ***********
>>> *** *** ***  email: kmorel at sandia.gov <http://kmorel@sandia.gov>
>>> **  ***  **  phone: (505) 844-8919
>>>     ***      web:   http://www.cs.unm.edu/~kmorel
>>>
>>>
>>> _______________________________________________
>>> Paraview-developers mailing list
>>> Paraview-developers at paraview.org
>>> http://public.kitware.com/mailman/listinfo/paraview-developers
>>>
>>>
>>>
>>>
>>>
>>>    ****      Kenneth Moreland
>>>     ***      Sandia National Laboratories
>>> ***********
>>> *** *** ***  email: kmorel at sandia.gov
>>> **  ***  **  phone: (505) 844-8919
>>>     ***      web:   http://www.cs.unm.edu/~kmorel
>>>
>>
>
>
> _______________________________________________
> Paraview-developers mailing list
> Paraview-developers at paraview.org
> http://public.kitware.com/mailman/listinfo/paraview-developers
>
>



-- 
François Bertel, PhD  | Kitware Inc. Suite 204
1 (518) 371 3971 x113 | 28 Corporate Drive
                      | Clifton Park NY 12065, USA


More information about the Paraview-developers mailing list