Skip to content

Commit

Permalink
fixup! Makefile: Warn if submodule status '+'-prefixed
Browse files Browse the repository at this point in the history
  • Loading branch information
KrystalDelusion committed Feb 17, 2025
1 parent 03d9138 commit dc03e17
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ check-git-abc:
elif git -C "$(YOSYS_SRC)" submodule status abc 2>/dev/null | grep -q '^+'; then \
echo "'abc' submodule does not match expected commit."; \
echo "Run 'git submodule update' to check out the correct version."; \
echo "Note: If testing a different version of abc, call `git commit abc` in the Yosys source directory to update the expected commit."; \
echo "Note: If testing a different version of abc, call 'git commit abc' in the Yosys source directory to update the expected commit."; \
exit 1; \
elif git -C "$(YOSYS_SRC)" submodule status abc 2>/dev/null | grep -q '^U'; then \
echo "'abc' submodule has merge conflicts."; \
Expand Down

0 comments on commit dc03e17

Please sign in to comment.