[m-dev.] libatomic_ops submodule

Peter Wang novalazy at gmail.com
Tue Oct 6 14:55:12 AEDT 2015


On Tue, 6 Oct 2015 13:20:33 +1100, Paul Bone <paul at bone.id.au> wrote:
> On Mon, Oct 05, 2015 at 07:47:48PM +1100, Zoltan Somogyi wrote:
> > I have a couple of problems with the new libatomic_ops submodule.
> > 
> > The first problem is that I keep getting this as part of my diffs:
> > 
> > diff --git a/libatomic_ops b/libatomic_ops
> > --- a/libatomic_ops
> > +++ b/libatomic_ops
> > @@ -1 +1 @@
> > -Subproject commit 137001b1d9bddc0034de887c8e6ebc32893b1821
> > +Subproject commit 137001b1d9bddc0034de887c8e6ebc32893b1821-dirty
> > 
> > Does anyone know what causes this, and how to stop it, other than
> > deleting the directory and fetching it again?
> 
> Because some generated files are kept in the libatomic_ops directory to
> avoid a dependency on libtool, when they are regenerated for whatever reason
> git recognises that you have uncommited changes there.

The only file that is untracked for me is 'libtool'.
Isn't it a matter of adding it to .gitignore?

There is git status --ignore-submodules=untracked
and the corresponding configuration file option.

We might also add this to .gitmodules:

[submodule "libatomic_ops"]
    path = libatomic_ops
    url = ../libatomic_ops.git
    branch = release-7_4-mercury
    ignore = untracked

> > The second is that I often change to the library directory by doing
> > "cd ../libTAB", where TAB is my filename completion character.
> > That used to work, but now libatomic_ops is also a valid completion
> > of just "lib". Can we give this directory some name that doesn't
> > get in the way like this?
> 
> I'm happy to hear suggestions for a new name.

The obvious name is "atomic_ops".  It would be nice to keep all the
names the same (upstream repo, our repo, submodule name, directory name,
symlink) but we already have a difference for "boehm_gc".

Peter



More information about the developers mailing list