Skip to content

Add diff subcommand #87

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
JohanMabille merged 4 commits into from
Feb 6, 2026
Merged

Add diff subcommand #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
666b5bd
Add diff subcommand
SandrineP Jan 21, 2026
be2f309
edit error codes
SandrineP Feb 5, 2026
5879159
address review comments
SandrineP Feb 6, 2026
93be714
Update src/subcommand/diff_subcommand.cpp
SandrineP Feb 6, 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
10 changes: 10 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ set(GIT2CPP_SRC
${GIT2CPP_SOURCE_DIR}/subcommand/checkout_subcommand.hpp
${GIT2CPP_SOURCE_DIR}/subcommand/clone_subcommand.cpp
${GIT2CPP_SOURCE_DIR}/subcommand/clone_subcommand.hpp
${GIT2CPP_SOURCE_DIR}/subcommand/diff_subcommand.cpp
${GIT2CPP_SOURCE_DIR}/subcommand/diff_subcommand.hpp
${GIT2CPP_SOURCE_DIR}/subcommand/commit_subcommand.cpp
${GIT2CPP_SOURCE_DIR}/subcommand/commit_subcommand.hpp
${GIT2CPP_SOURCE_DIR}/subcommand/config_subcommand.cpp
Expand Down Expand Up @@ -96,10 +98,16 @@ set(GIT2CPP_SRC
${GIT2CPP_SOURCE_DIR}/wrapper/commit_wrapper.hpp
${GIT2CPP_SOURCE_DIR}/wrapper/config_wrapper.cpp
${GIT2CPP_SOURCE_DIR}/wrapper/config_wrapper.hpp
${GIT2CPP_SOURCE_DIR}/wrapper/diff_wrapper.cpp
${GIT2CPP_SOURCE_DIR}/wrapper/diff_wrapper.hpp
${GIT2CPP_SOURCE_DIR}/wrapper/diffstats_wrapper.cpp
${GIT2CPP_SOURCE_DIR}/wrapper/diffstats_wrapper.hpp
${GIT2CPP_SOURCE_DIR}/wrapper/index_wrapper.cpp
${GIT2CPP_SOURCE_DIR}/wrapper/index_wrapper.hpp
${GIT2CPP_SOURCE_DIR}/wrapper/object_wrapper.cpp
${GIT2CPP_SOURCE_DIR}/wrapper/object_wrapper.hpp
${GIT2CPP_SOURCE_DIR}/wrapper/patch_wrapper.cpp
${GIT2CPP_SOURCE_DIR}/wrapper/patch_wrapper.hpp
${GIT2CPP_SOURCE_DIR}/wrapper/rebase_wrapper.cpp
${GIT2CPP_SOURCE_DIR}/wrapper/rebase_wrapper.hpp
${GIT2CPP_SOURCE_DIR}/wrapper/refs_wrapper.cpp
Expand All @@ -114,6 +122,8 @@ set(GIT2CPP_SRC
${GIT2CPP_SOURCE_DIR}/wrapper/signature_wrapper.hpp
${GIT2CPP_SOURCE_DIR}/wrapper/status_wrapper.cpp
${GIT2CPP_SOURCE_DIR}/wrapper/status_wrapper.hpp
${GIT2CPP_SOURCE_DIR}/wrapper/tree_wrapper.cpp
${GIT2CPP_SOURCE_DIR}/wrapper/tree_wrapper.hpp
${GIT2CPP_SOURCE_DIR}/wrapper/wrapper_base.hpp
${GIT2CPP_SOURCE_DIR}/main.cpp
${GIT2CPP_SOURCE_DIR}/version.hpp
Expand Down
2 changes: 2 additions & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "subcommand/clone_subcommand.hpp"
#include "subcommand/commit_subcommand.hpp"
#include "subcommand/config_subcommand.hpp"
#include "subcommand/diff_subcommand.hpp"
#include "subcommand/fetch_subcommand.hpp"
#include "subcommand/init_subcommand.hpp"
#include "subcommand/log_subcommand.hpp"
Expand Down Expand Up @@ -44,6 +45,7 @@ int main(int argc, char** argv)
clone_subcommand clone(lg2_obj, app);
commit_subcommand commit(lg2_obj, app);
config_subcommand config(lg2_obj, app);
diff_subcommand diff(lg2_obj, app);
fetch_subcommand fetch(lg2_obj, app);
reset_subcommand reset(lg2_obj, app);
log_subcommand log(lg2_obj, app);
Expand Down
2 changes: 1 addition & 1 deletion src/subcommand/checkout_subcommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void checkout_subcommand::run()

if (repo.state() != GIT_REPOSITORY_STATE_NONE)
{
throw std::runtime_error("Cannot checkout, repository is in unexpected state");
throw std::runtime_error("Cannot checkout, repository is in unexpected state");
}

git_checkout_options options;
Expand Down
Loading