fix(build): resolve Linux compile errors
This commit is contained in:
@@ -123,7 +123,6 @@ namespace
|
|||||||
return origin != remotes.end() ? *origin : remotes.front();
|
return origin != remotes.end() ? *origin : remotes.front();
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
std::string encodeBase64(std::string_view value)
|
std::string encodeBase64(std::string_view value)
|
||||||
{
|
{
|
||||||
static constexpr std::string_view alphabet =
|
static constexpr std::string_view alphabet =
|
||||||
@@ -143,7 +142,6 @@ namespace
|
|||||||
}
|
}
|
||||||
return encoded;
|
return encoded;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
std::vector<std::string> withAuthOverrideArguments(std::vector<std::string> arguments,
|
std::vector<std::string> withAuthOverrideArguments(std::vector<std::string> arguments,
|
||||||
const std::optional<GitAuthOverride> &auth)
|
const std::optional<GitAuthOverride> &auth)
|
||||||
@@ -933,6 +931,8 @@ bool GitManager::captureGit(RepositoryView &repository, const std::vector<std::s
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
(void)arguments;
|
(void)arguments;
|
||||||
|
(void)command_output;
|
||||||
|
(void)stdin_data;
|
||||||
error = "Git commands are currently supported on Windows";
|
error = "Git commands are currently supported on Windows";
|
||||||
return false;
|
return false;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -1336,7 +1336,7 @@ void sidebar_item_context(const std::string& item, SidebarItemKind kind) {
|
|||||||
if (ImGui::MenuItem(ICON_TB_FOLDER_OPEN " Open in file manager")) {
|
if (ImGui::MenuItem(ICON_TB_FOLDER_OPEN " Open in file manager")) {
|
||||||
std::string error;
|
std::string error;
|
||||||
const std::filesystem::path path = kind == SidebarItemKind::worktree
|
const std::filesystem::path path = kind == SidebarItemKind::worktree
|
||||||
? g_git_manager->worktreePath(repo(), item, error)
|
? std::filesystem::path(g_git_manager->worktreePath(repo(), item, error))
|
||||||
: std::filesystem::path(repo().path) / item;
|
: std::filesystem::path(repo().path) / item;
|
||||||
if (path.empty() || !izo::OpenPath(path, &error)) g_notice = error;
|
if (path.empty() || !izo::OpenPath(path, &error)) g_notice = error;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user