Keeping west modules in sync with main tree

[nashif]

How do I keep my west modules updates across rebases, bisecting and other git operations when doing upstream development and when using the upstream manifest.

[nashif]

add two git hooks:

$ cat  .git/hooks/post-merge
#!/bin/sh

CHANGED=`git diff HEAD@{1} --stat -- west.yml | wc -l`
if [ $CHANGED -gt 0 ];
then
    echo "west.yml has changed!"
    west update
fi

and

$ cat  .git/hooks/post-checkout
#!/bin/sh

GIT_ROOT=`git rev-parse --show-toplevel`
CHANGED=`git diff HEAD@{1} --stat -- ${GIT_ROOT}/west.yml | wc -l`
if [ $CHANGED -gt 0 ];
then
    echo "west.yml has changed!"
    west update
fi

Now every time you move in git history, modules will get updated and be in sync with main git repo.

[mbolivar-nordic]

Be careful with this advice. It only works if zephyr is your manifest repository.

It does not work in other situations, such as if you're importing the zephyr manifest file somewhere else, or if your manifest file uses projects with revisions set to branches.

[mbolivar-nordic]

Saying that this does not work for your users so the majority of zephyr users should not use it is absurd.

Please be so kind as to point out where I said that?

[nashif]

Please be so kind as to point out where I said that?

I expect that many of the users I care about are doing something else.

[mbolivar-nordic]

There is an implicit assumption about what the majority of zephyr users are doing in your argument.

[nashif]

the question is

How do I keep my west modules updates across rebases, bisecting and other git operations when doing upstream development and when using the upstream manifest.

so, there are no assumptions at all, this is not for everyone, this is for someone doing upstream development dealing with rebases and bisecting on a regular basis..

I am not sure to be honest what the argument here is about, this is a common issue and this is one solution, it works, if you have something better to suggest, please go ahead and be my guest.

[marc-hb]

This looks like a violent agreement. Good advice but think twice and don't blindly copy/paste. Thank you both :-)