diff options
| -rw-r--r-- | round-robin.sh | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/round-robin.sh b/round-robin.sh index 129e6fd5..6e669e11 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -95,15 +95,16 @@ reset_artifacts () # don't overwrite it. # base-artifacts repo is big and changes all the time, so we # fetch only the $baseline_branch, instead of all branches. - # - # Since we re-write history of base-artifacts all the time we can't - # rely on SHA1 stored in manifests (aka ${rr[base-artifacts_rev]}) to - # exist. The important case here is reproduction of regressions from - # email instructions: baseline run with reset_baseline set. We could - # have tagged such SHA1s to keep them stored in the repo, but it is easier - # to just ignore base-artifacts_rev when reset_baseline is set. - if ${rr[init_configuration]-false} \ - || ${rr[base-artifacts_rev]+${rr[reset_baseline]}}; then + if ${rr[init_configuration]-false}; then + rr[base-artifacts_rev]=empty + single_branch=empty + elif [ x"${rr[base-artifacts_rev]+set}" = x"set" ] && ${rr[reset_baseline]}; then + # Since we re-write history of base-artifacts all the time we can't + # rely on SHA1 stored in manifests (aka ${rr[base-artifacts_rev]}) to + # exist. The important case here is reproduction of regressions from + # email instructions: baseline run with reset_baseline set. We could + # have tagged such SHA1s to keep them stored in the repo, but it is easier + # to just ignore base-artifacts_rev when reset_baseline is set. rr[base-artifacts_rev]=empty single_branch=empty else |