From e69b4857fc2e9ea816480db20a11a5aee16c9acf Mon Sep 17 00:00:00 2001 From: Neil Macneale IV Date: Thu, 21 Dec 2023 13:47:20 -0800 Subject: [PATCH] verify that branch deletes don't overwrite dirty remotes --- integration-tests/bats/sql-server-remotesrv.bats | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/integration-tests/bats/sql-server-remotesrv.bats b/integration-tests/bats/sql-server-remotesrv.bats index 7e8c45844f..6889d42ff6 100644 --- a/integration-tests/bats/sql-server-remotesrv.bats +++ b/integration-tests/bats/sql-server-remotesrv.bats @@ -590,6 +590,10 @@ GRANT CLONE_ADMIN ON *.* TO clone_admin_user@'localhost'; dolt clone http://localhost:$APIPORT/remote cloned_db -u $SQL_USER cd cloned_db + run dolt push origin --user $SQL_USER :new_branch + [[ "$status" -ne 0 ]] || false + [[ "$output" =~ "target has uncommitted changes. --force required to overwrite" ]] || false + run dolt push origin --force --user $SQL_USER :new_branch [[ "$status" -eq 0 ]] || false