On Tue, 24 Feb 2009, Mark Taylor wrote:
> I just tried to update my starlink sources:
>
> % git pull
> remote: Counting objects: 284, done.
> remote: Compressing objects: 100% (224/224), done.
> remote: Total 224 (delta 181), reused 0 (delta 0)
> Receiving objects: 100% (224/224), 23.83 KiB, done.
> Resolving deltas: 100% (181/181), completed with 59 local objects.
> From git://starlink.jach.hawaii.edu/starlink
> f89b8d6..8b9f1e3 master -> origin/master
> Updating f89b8d6..8b9f1e3
> fatal: Untracked working tree file 'thirdparty/heasarc/cfitsio/cfitsio/.gitignore' would be removed by merge.
>
> not sure what I was supposed to do about that, I had a go at:
>
> % rm thirdparty/heasarc/cfitsio/cfitsio/.gitignore
>
> but that didn't help much:
>
> % git pull
> Updating f89b8d6..8b9f1e3
> applications/smurf/libacsis/specwrite: needs update
> thirdparty/eso/skycat/skycat: needs update
> thirdparty/heasarc/cfitsio/cfitsio/.gitignore: needs update
> fatal: Updating 'thirdparty/heasarc/cfitsio/cfitsio' would lose untracked files in it
>
> so I stopped fiddling. Can anyone help? I haven't made any local
> modifications, other than doing a build.
>
Hi Mark,
it's the build that matters. Do:
% rm -rf thirdparty/heasarc/cfitsio/cfitsio/*
to clear out all the built files from that directory. Once that's done it
can be re-used as a submodule and the pull should pick up.
There are a load of other submodules that have been added since CFITSIO
(but we could be at the end of these modifications, unless Tim can think
of some others), so you'll need to clear them out as well.
If you'd like to automate the process have a look at git-clean, for
instance:
% git clean -ndx thirdparty
would list all the untracked files in thirdparty -- change n to f and they
can all be deleted. Naturally you'd need to re-run bootstrap etc. after
that kind of aggression (although not immediately, as the thirdparty tree
is already built and installed).
Cheers,
Peter.
|