On Tue, 25 May 2010, Edward Chapin wrote:

> Date: Tue, 25 May 2010 14:30:51 -0700

> I suspect this is something that's already been discussed before, but I
> don't get what's happening.

Hi Ed,

this all seems a bit wacky. Normally if you see the below I'd just do:

   ./update-modules

and if that refused and I knew I had no local modifications in the
submodule that I wanted to keep, I'd do:

   ./update-modules -f

Usually you would only see these submodules as modified if they were out
of date, but sometimes you can get locally modified files, usually
generated ones, which the second case will fix. Maybe you have something
setup that is causing modified files to be generated when normally this
wouldn't happen. This could be caused by inconsistent file timestamps.

If you see this again send the full output from ./update-modules which
should show what has been modified.

One final thought if you have a long lived branch then you will need to
rebase that against master and run update-modules to get back into sync
with changes to the expected submodule SHA. If you don't do that you'll
constantly find the submodules look out of sync.

cheers,

Peter.

> On one of my machines a bunch of submodules keep claiming to have
> uncommitted changes, e.g.
>
> $ git status
> # 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:   thirdparty/apache/xerces-c/xerces-c
> #	modified:   thirdparty/heasarc/cfitsio/cfitsio
> #	modified:   thirdparty/latex2html/latex2html/latex2html
> #	modified:   thirdparty/rit/match/match
> #	modified:   thirdparty/tclsys/blt/blt
> #	modified:   thirdparty/tclsys/itcl/iwidgets
> #	modified:   thirdparty/tclsys/tclx/tclx
> #	modified:   thirdparty/tclsys/tkimg/tkimg
> #
>
> If I look at this in gitk I notice "dirty" appended to the commit SHA1 in
> the lower-left box, i.e.
>
> --------------------- thirdparty/apache/xerces-c/xerces-c ---------------------
> Submodule thirdparty/apache/xerces-c/xerces-c 65e349f..65e349f-dirty:
>
> ---------------------- thirdparty/heasarc/cfitsio/cfitsio ----------------------
> Submodule thirdparty/heasarc/cfitsio/cfitsio 744c584..744c584-dirty:
>
> ----------------- thirdparty/latex2html/latex2html/latex2html -----------------
> Submodule thirdparty/latex2html/latex2html/latex2html eee1edc..eee1edc-dirty:
>
> -------------------------- thirdparty/rit/match/match --------------------------
> Submodule thirdparty/rit/match/match 4e60352..4e60352-dirty:
>
> -------------------------- thirdparty/tclsys/blt/blt --------------------------
> Submodule thirdparty/tclsys/blt/blt 3628f25..3628f25-dirty:
>
> ----------------------- thirdparty/tclsys/itcl/iwidgets -----------------------
> Submodule thirdparty/tclsys/itcl/iwidgets 291b8e2..291b8e2-dirty:
>
> ------------------------- thirdparty/tclsys/tclx/tclx -------------------------
> Submodule thirdparty/tclsys/tclx/tclx 9ff2b9b..9ff2b9b-dirty:
>
> ------------------------ thirdparty/tclsys/tkimg/tkimg ------------------------
> Submodule thirdparty/tclsys/tkimg/tkimg b021c86..b021c86-dirty:
>
>
> I've tried things like git clean -fdx on these directories, I've run
> update-modules, clean-modules, and remove-modules. Finally I even deleted
> the whole thirdparty tree and did a fresh git checkout thirdparty,
> ./update-modules, re-bootstrapped, configured, removed from manifests and
> then make-world. I still end up with these same "dirty" messages.
>
> I believe when I first did the checkout and update-modules I don't see the
> "dirty" message.
>
> What's going on here / how do I make these messages go away?
>
> thanks,
> Ed
>

-- 
Peter W. Draper, http://astro.dur.ac.uk/~pdraper