Merge branch 'st/tag'

* st/tag:
  tag: Add more tests about mixing incompatible modes and options
  tag: Check that options are only allowed in the appropriate mode

diff --cc builtin-tag.c
Simple merge

diff --cc t/t7004-tag.sh
Simple merge