Skip to content

Gitlab Templates Downstream

Branches

The default branch is main, which is used for building documentation and testing the pages job.

The other branch names show the minimum Drupal core compatibility, followed by some short indicative text.

  • d7-basic has a .info file (not a .info.yml) and no composer.json file.

  • d7-composer has a .info.yml file and a composer.json file.

  • d9-basic has a .info.yml file but no composer.json file. It is tested against Drupal 9 and Drupal 10, but not Drupal 11.

  • d10-plus is a module tested against Drupal 10 and 11.

  • d10-theme is a theme tested against Drupal 10 and 11.

  • d10-profile is a profile tested against Drupal 10 and 11.

Compare with parent branch

When working locally on an issue fork or MR branch it is necessary to easily see how the branch differs from its original parent. To avoid having to remember and type the specific parent branch, here is a git alias for the commands:

[alias]
    difp = "!f() { PARENT=$(git show-branch | grep '*' | grep -v "$(git rev-parse --abbrev-ref HEAD)" | head -n1 | sed -E 's#^.*\\[([a-z0-9\\-]*).*#\\1#' ); echo \"PARENT=$PARENT\"; git diff $PARENT; unset -f f;} ; f"

Then you only need to run git difp to see the full set of changes between the current branch and its parent branch.