Fix make dev-tree git functions (hashicorp#608)

Co-authored-by: Saad Jamal <[email protected]>
duckhan · Aug 12, 2021 · 1d63a58 · 1d63a58
1 parent af7eafa
commit 1d63a58
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/control-plane/build-support/functions/10-util.sh b/control-plane/build-support/functions/10-util.sh
@@ -857,7 +857,7 @@ function commit_dev_mode {
    pushd "$1" > /dev/null
 
    status "Staging CHANGELOG.md and version_*.go files"
-   git add CHANGELOG.md && git add version/version*.go
+   git add CHANGELOG.md && git add control-plane/version/version*.go
    ret=$?
 
    if test ${ret} -eq 0

diff --git a/control-plane/build-support/scripts/dev.sh b/control-plane/build-support/scripts/dev.sh
@@ -86,6 +86,9 @@ function main {
 
    set_dev_mode "${sdir}" || return 1
 
+   # Currently we're in control-plane, but for git functions we should be in top-level.
+   cd ".."
+
    if is_set "${do_git}"
    then
       status_stage "==> Commiting Dev Mode Changes"