Add diff subcommand - #87
Merged
JohanMabille merged 4 commits intoFeb 6, 2026
Merged
JohanMabille merged 4 commits into
JohanMabille merged 4 commits into
Conversation
Copy link
Copy Markdown
Collaborator
Sorry, something went wrong.
SandrineP
force-pushed
the
diff_cmd
branch
3 times, most recently
from
2acbb53 to
e8e7b97
Compare
February 5, 2026 10:01
SandrineP
marked this pull request as ready for review
February 5, 2026 10:09
Copy link
Copy Markdown
Member
|
When building locally on macos I see /Users/iant/github/git2cpp/src/utils/common.cpp:114:23: error: implicit instantiation of undefined template 'std::basic_stringstream<char>'
114 | std::stringstream buffer;
| ^
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/c++/v1/__fwd/sstream.h:30:28: note: template is declared here
30 | class _LIBCPP_TEMPLATE_VIS basic_stringstream;
| ^
1 error generated.To fix this I need to add #include <sstream> to the top of src/utils/common.cpp |
Sorry, something went wrong.
ianthomas23
requested changes
Feb 5, 2026
Comment thread
src/subcommand/checkout_subcommand.cpp
Outdated
| if (repo.state() != GIT_REPOSITORY_STATE_NONE) | ||
| { | ||
| throw std::runtime_error("Cannot checkout, repository is in unexpected state"); | ||
| std::runtime_error("Cannot checkout, repository is in unexpected state"); |
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
It looks like was deleted by accident?
Sorry, something went wrong.
Comment thread
src/subcommand/diff_subcommand.cpp
Outdated
|
|
||
| static int colour_printer([[maybe_unused]] const git_diff_delta* delta, [[maybe_unused]] const git_diff_hunk* hunk, const git_diff_line* line, void* payload) | ||
| { | ||
| bool* use_colour = reinterpret_cast<bool*>(payload); |
Copy link
Copy Markdown
Member
There was a problem hiding this comment.
I think it would be better to store bool use_colour rather than bool*. As it stands, later in this function both *use_colour and use_colour (without the dereference) are used, and they can't both work correctly!
Sorry, something went wrong.
JohanMabille
reviewed
Feb 6, 2026
JohanMabille
reviewed
Feb 6, 2026
Comment thread
src/subcommand/diff_subcommand.cpp
Outdated
Co-authored-by: Johan Mabille <johan.mabille@gmail.com>
ianthomas23
approved these changes
Feb 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Reviewers
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add diff subcommand