Better merge behavior for git-gate repos #237

New Issue

2026-06-19T21:53:09-04:00

didericis commented

2026-06-19 21:53:09 -04:00

When I extend bottles with two git-gate repos of the same name, the latter one completely overwrites the former, making it harder/less useful to extend repo configuration. The git-gate configuration should be merged instead.

bot-bottle-dev

git-gate:
  repos:
    bot-bottle:
      url: ssh://git@100.78.141.42:30009/didericis/bot-bottle.git
      host_key: "..."
      key:
        provider: static
        path: ~/.ssh/gitea-delos-2.pem

egress:
  log: 2
  routes:
    - host: pypi.org
      dlp:
        inbound_detectors: false
    - host: files.pythonhosted.org
      dlp:
        inbound_detectors: false

bot-bottle-provisioned

extends: bot-bottle-dev

git-gate:
  repos:
    bot-bottle:
      key:
        provider: gitea
        forge_token_env: GITEA_ADMIN_TOKEN

Final config should look like this:

git-gate:
  repos:
    bot-bottle:
      url: ssh://git@100.78.141.42:30009/didericis/bot-bottle.git
      host_key: "..."
      key:
        provider: gitea
        forge_token_env: GITEA_ADMIN_TOKEN

egress:
  log: 2
  routes:
    - host: pypi.org
      dlp:
        inbound_detectors: false
    - host: files.pythonhosted.org
      dlp:
        inbound_detectors: false

When I extend bottles with two git-gate repos of the same name, the latter one completely overwrites the former, making it harder/less useful to extend repo configuration. The git-gate configuration should be merged instead. `bot-bottle-dev` ```yaml git-gate: repos: bot-bottle: url: ssh://git@100.78.141.42:30009/didericis/bot-bottle.git host_key: "..." key: provider: static path: ~/.ssh/gitea-delos-2.pem egress: log: 2 routes: - host: pypi.org dlp: inbound_detectors: false - host: files.pythonhosted.org dlp: inbound_detectors: false ``` `bot-bottle-provisioned` ```yaml extends: bot-bottle-dev git-gate: repos: bot-bottle: key: provider: gitea forge_token_env: GITEA_ADMIN_TOKEN ``` Final config should look like this: ```yaml git-gate: repos: bot-bottle: url: ssh://git@100.78.141.42:30009/didericis/bot-bottle.git host_key: "..." key: provider: gitea forge_token_env: GITEA_ADMIN_TOKEN egress: log: 2 routes: - host: pypi.org dlp: inbound_detectors: false - host: files.pythonhosted.org dlp: inbound_detectors: false ```

didericis added the Kind/Enhancement label 2026-06-19 21:53:32 -04:00

didericis referenced this issue from a commit

2026-06-19 22:02:20 -04:00

feat(manifest-extends): field-merge same-name git-gate repos on extends

didericis-claude referenced a pull request that will close this issue

2026-06-19 22:02:29 -04:00

Better merge behavior for git-gate repos on extends #238

didericis closed this issue

2026-06-22 14:49:50 -04:00

Sign in to join this conversation.