diff --git a/src/subcommand/merge_subcommand.cpp b/src/subcommand/merge_subcommand.cpp index 53d2115..fa704df 100644 --- a/src/subcommand/merge_subcommand.cpp +++ b/src/subcommand/merge_subcommand.cpp @@ -128,7 +128,6 @@ int populate_list(const git_oid* oid, void* payload) void merge_subcommand::run() { auto directory = get_current_git_path(); - auto bare = false; auto repo = repository_wrapper::open(directory); auto state = repo.state(); index_wrapper index = repo.make_index(); diff --git a/src/utils/terminal_pager.cpp b/src/utils/terminal_pager.cpp index e7fe551..1b79996 100644 --- a/src/utils/terminal_pager.cpp +++ b/src/utils/terminal_pager.cpp @@ -200,7 +200,7 @@ void terminal_pager::split_input_at_newlines(std::string_view str) { auto split = str | std::ranges::views::split('\n') | std::ranges::views::transform([](auto&& range) { - return std::string(range.begin(), std::ranges::distance(range)); + return std::string(range.begin(), range.end()); }); m_lines = std::vector{split.begin(), split.end()}; }