Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile: git submodule detect and warn if out-of-sync #20

Closed
wants to merge 2 commits into from

Conversation

netoptimizer
Copy link
Member

It is a reoccuring issue that git submodule gets out-of-sync, which cause confusion and issues.

End-user needs to run: git submodule update

We cannot run this automatically, because there are legimite reasons for the submodule to be out-of-sync, e.g. when testing local changes.

Thus, this patch detect SHA-1 doesn't match, and just warns end-users, together with a hint to call: git submodule update

It is a reoccuring issue that git submodule gets out-of-sync, which
cause confusion and issues.

 End-user needs to run:  git submodule update

We cannot run this automatically, because there are legimite
reasons for the submodule to be out-of-sync, e.g. when testing
local changes.

Thus, this patch detect SHA-1 doesn't match, and just warns
end-users, together with a hint to call: git submodule update

Signed-off-by: Jesper Dangaard Brouer <[email protected]>
It is a reoccuring issue that git submodule gets out-of-sync, which
cause confusion and issues.

 End-user needs to run:  git submodule update

We cannot run this automatically, because there are legimite
reasons for the submodule to be out-of-sync, e.g. when testing
local changes.

Thus, this patch detect SHA-1 doesn't match, and just warns
end-users, together with a hint to call: git submodule update

Signed-off-by: Jesper Dangaard Brouer <[email protected]>
@netoptimizer
Copy link
Member Author

Per discussion in PR #18

@tohojo
Copy link
Member

tohojo commented Apr 29, 2020

Erm, GitHub seems to think the commit is empty?

@netoptimizer
Copy link
Member Author

Erm, GitHub seems to think the commit is empty?

LOL - It seems I forgot got call stg refresh get changes integrated, usually stgit warns on different operations when having uncommitted changes, but I've tried the stg publish which didn't warn me.

@netoptimizer
Copy link
Member Author

I fixed it in the stg branch, and ran stg publish again. This resulted in two commit's one empty and the new with same text and contents. I'll try push a new branch, with a clean history.

@tohojo
Copy link
Member

tohojo commented Apr 30, 2020 via email

@netoptimizer
Copy link
Member Author

I will close this one, in favor of PR #21

@netoptimizer netoptimizer deleted the distclean02.public branch April 30, 2020 10:55
astoycos pushed a commit to astoycos/xdp-tools that referenced this pull request Nov 2, 2023
- Previous update broke CI git checkout
- CI was not testing pushed code
- Update makefile to build C code before uTests to fix error:
  "/usr/bin/ld: cannot find -lwrapper"
astoycos pushed a commit to astoycos/xdp-tools that referenced this pull request Nov 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants