github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: expose raw deploy-branch and keep-git-dir in git:report

Browse Source 
The bare `deploy-branch` and `keep-git-dir` keys in `git:report` returned the computed (effective) value rather than the raw per-app value, with no separate `computed-*` key to distinguish "set per-app" from "falling back to global or default". This left external tooling unable to detect a per-app unset without out-of-band state. The bare keys now hold the raw per-app value (empty when unset) and new `computed-deploy-branch` and `computed-keep-git-dir` keys hold the effective value, matching the convention used by `nginx-vhosts`, `network`, and `builder`. Closes #8610.
This commit is contained in:
Jose Diaz-Gonzalez
2026-05-11 22:18:17 -04:00
parent 541464b9c8
commit c45b95fc4d
4 changed files with 138 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/unit/git_3.bats
View File

@@ -770,7 +770,7 @@ teardown() {
}
@test "(git:sync) --skip-deploy-branch" {
run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
echo "output: $output"
echo "status: $status"
assert_success
@@ -798,7 +798,7 @@ teardown() {
echo "status: $status"
assert_success
run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
echo "output: $output"
echo "status: $status"
assert_success
@@ -810,7 +810,7 @@ teardown() {
assert_success
assert_output_contains "skipping deploy-branch setting"
run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
echo "output: $output"
echo "status: $status"
assert_success
@@ -818,7 +818,7 @@ teardown() {
}
@test "(git:sync) --build --skip-deploy-branch" {
run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
echo "output: $output"
echo "status: $status"
assert_success
@@ -831,7 +831,7 @@ teardown() {
assert_output_contains "skipping deploy-branch setting"
assert_output_contains "Application deployed"
run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
echo "output: $output"
echo "status: $status"
assert_success
@@ -839,7 +839,7 @@ teardown() {
}
@test "(git:sync) --build-if-changes --skip-deploy-branch" {
run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
echo "output: $output"
echo "status: $status"
assert_success
@@ -852,7 +852,7 @@ teardown() {
assert_output_contains "skipping deploy-branch setting"
assert_output_contains "Application deployed"
run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
echo "output: $output"
echo "status: $status"
assert_success
@@ -864,7 +864,7 @@ teardown() {
assert_success
assert_output_contains "Skipping build as no changes were detected"
run /bin/bash -c "dokku git:report $TEST_APP --git-deploy-branch"
run /bin/bash -c "dokku git:report $TEST_APP --git-computed-deploy-branch"
echo "output: $output"
echo "status: $status"
assert_success