File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -17,13 +17,15 @@ EXTRA_PLAYBOOK_OPTS ?=
1717# INDEX_IMAGES=registry-proxy.engineering.redhat.com/rh-osbs/iib:394248,registry-proxy.engineering.redhat.com/rh-osbs/iib:394249
1818INDEX_IMAGES ?=
1919
20- TARGET_ORIGIN ?= origin
2120# This is to ensure that whether we start with a git@ or https:// URL, we end up with an https:// URL
2221# This is because we expect to use tokens for repo authentication as opposed to SSH keys
2322TARGET_REPO =$(shell git ls-remote --get-url --symref $(TARGET_ORIGIN ) | sed -e 's/.* URL:[[:space:]]* //' -e 's% ^git@%% ' -e 's% ^https://%% ' -e 's% :% /% ' -e 's% ^% https://% ')
2423# git branch --show-current is also available as of git 2.22, but we will use this for compatibility
2524TARGET_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
2625
26+ # default to the branch remote
27+ TARGET_ORIGIN ?= $(shell git config branch.$(TARGET_BRANCH ) .remote)
28+
2729UUID_FILE ?= ~/.config/validated-patterns/pattern-uuid
2830UUID_HELM_OPTS ?=
2931
You can’t perform that action at this time.
0 commit comments