aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2025-10-17 13:56:24 +0200
committerGitHub Enterprise <[email protected]>2025-10-17 13:56:24 +0200
commitfd379417e7cecbefa3a5711211491275364ca2b4 (patch)
tree632c5b868277feca3fa78d0e3db79185fae105dc
parentadd ability to abort http requests (#586) (diff)
downloadzen-fd379417e7cecbefa3a5711211491275364ca2b4.tar.xz
zen-fd379417e7cecbefa3a5711211491275364ca2b4.zip
add missing return statements for successful execution of zen workspace cmd (#587)
-rw-r--r--CHANGELOG.md1
-rw-r--r--src/zen/cmds/workspaces_cmd.cpp4
2 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48b7af5fd..130d34a78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
- Improvement: Exclude various source code file extensions from chunking and compress them as individual chunks
- Improvement: Make cancelling of `zen builds` operations more responsive
- Bugfix: Add quotes around messages when using `--log-progress` with `zen builds` commands
+- Bugfix: Fix ASSERT after running `zen workspace info` on a non-existing workspace
## 5.7.6
- Improvement: Oidc token executable is now launched hidden when launch from inside zenserver (oplog import/export)
diff --git a/src/zen/cmds/workspaces_cmd.cpp b/src/zen/cmds/workspaces_cmd.cpp
index 9bb118eac..b118d20a4 100644
--- a/src/zen/cmds/workspaces_cmd.cpp
+++ b/src/zen/cmds/workspaces_cmd.cpp
@@ -229,12 +229,12 @@ WorkspaceCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
if (Workspace.Id != Oid::Zero)
{
ShowWorkspace(Workspace, ""sv);
- return;
}
else
{
ZEN_CONSOLE_WARN("Workspace {} not found", m_Id);
}
+ return;
}
}
@@ -268,8 +268,6 @@ WorkspaceCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
}
return;
}
-
- ZEN_ASSERT(false);
}
/////////////////////////////////////////////////////////////////////////