Skip to content

Add tracking info for log subcommand #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ianthomas23 merged 3 commits into from
Feb 27, 2026
Merged

Add tracking info for log subcommand #106

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81992bd
Add tracking info
SandrineP Feb 24, 2026
807cb09
address review comments
SandrineP Feb 27, 2026
8e58bbc
address review comments
SandrineP Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
address review comments
  • Loading branch information
@SandrineP
SandrineP committed Feb 27, 2026
commit 807cb093bff5f9a73edea2750ecf8b84b1f9ef34
32 changes: 22 additions & 10 deletions src/subcommand/log_subcommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <exception>
#include <format>
#include <git2.h>
#include <git2/oid.h>
#include <git2/refs.h>
#include <git2/types.h>
#include <sstream>
#include <string_view>
#include <vector>

Expand Down Expand Up @@ -77,11 +77,11 @@ std::vector<std::string> get_tags_for_commit(repository_wrapper& repo, const git
}
}

git_strarray_dispose(&tag_names);
git_strarray_dispose(&tag_names); // TODO: refactor git_strarray_wrapper to use it here
return tags;
}

std::vector<std::string> get_branches_for_commit(repository_wrapper& repo, git_branch_t type, const git_oid* commit_oid, const std::string exclude_branch)
std::vector<std::string> get_branches_for_commit(repository_wrapper& repo, git_branch_t type, const git_oid& commit_oid, const std::string exclude_branch)
{
std::vector<std::string> branches;

Expand All @@ -105,7 +105,7 @@ std::vector<std::string> get_branches_for_commit(repository_wrapper& repo, git_b
}
}

if (branch_target && git_oid_equal(branch_target, commit_oid))
if (branch_target && git_oid_equal(branch_target, &commit_oid))
{
std::string branch_name;
branch_name = branch->name();
Expand Down Expand Up @@ -139,28 +139,28 @@ struct commit_refs
}
};

commit_refs get_refs_for_commit(repository_wrapper& repo, const git_oid* commit_oid)
commit_refs get_refs_for_commit(repository_wrapper& repo, const git_oid& commit_oid)
{
commit_refs refs;

if (!repo.is_head_unborn())
{
auto head = repo.head();
auto head_taget = head.target();
if (git_oid_equal(head_taget, commit_oid))
if (git_oid_equal(head_taget, &commit_oid))
{
refs.head_branch = head.short_name();
}
}

refs.tags = get_tags_for_commit(repo, commit_oid);
refs.tags = get_tags_for_commit(repo, &commit_oid);
refs.local_branches = get_branches_for_commit(repo, GIT_BRANCH_LOCAL, commit_oid, refs.head_branch);
refs.remote_branches = get_branches_for_commit(repo, GIT_BRANCH_REMOTE, commit_oid, "");

return refs;
}

void print_refs(commit_refs refs)
void print_refs(const commit_refs& refs)
{
if (!refs.has_refs())
{
Expand Down Expand Up @@ -223,7 +223,7 @@ void print_commit(repository_wrapper& repo, const commit_wrapper& commit, std::s
stream_colour_fn colour = termcolor::yellow;
std::cout << colour << "commit " << buf;

commit_refs refs = get_refs_for_commit(repo, &commit.oid());
commit_refs refs = get_refs_for_commit(repo, commit.oid());
print_refs(refs);

std::cout << termcolor::reset << std::endl;
Expand All @@ -247,7 +247,19 @@ void print_commit(repository_wrapper& repo, const commit_wrapper& commit, std::s
print_time(author.when(), "Date:\t");
}
}
std::cout << "\n " << commit.message();

std::string message = commit.message();
while (!message.empty() && message.back() == '\n')
{
message.pop_back();
}
std::istringstream message_stream(message);
std::string line;
while (std::getline(message_stream, line))
{
std::cout << "\n " << line;
}
std::cout << std::endl;
}

void log_subcommand::run()
Expand Down