FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Add ```merge``` subcommand (fastforward) by SandrineP · Pull Request #48 · QuantStack/git2cpp · GitHub

  1. QuantStack
  2. git2cpp

Repository navigation

Add merge subcommand (fastforward) - #48

Merged
ianthomas23 merged 4 commits into
QuantStack:mainfrom
SandrineP:merge_sc
Oct 30, 2025
ConversationCommits (4)ChecksFiles changed
Merged

Add merge subcommand (fastforward)#48
ianthomas23 merged 4 commits into
QuantStack:mainfrom
SandrineP:merge_sc

Conversation

SandrineP commented Oct 2, 2025 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Add merge subcommand (fastforward)

SandrineP force-pushed the merge_sc branch 2 times, most recently from 0b08d8e to 2c7544b Compare October 3, 2025 16:29

ianthomas23 commented Oct 10, 2025

Copy link
Copy Markdown
Member

It looks like we need to find a way to run the tests without it picking up the ~/.gitconfig on our dev machines, so that CI and local tests are doing the same thing.

SandrineP changed the title Add merge subcommand Add merge subcommand (fastforward) Oct 28, 2025
SandrineP marked this pull request as ready for review October 28, 2025 13:55
ianthomas23 requested changes Oct 29, 2025
View reviewed changes
Comment thread src/subcommand/merge_subcommand.cpp Outdated
Comment thread src/subcommand/merge_subcommand.cpp
Comment thread src/subcommand/merge_subcommand.cpp
Comment thread src/wrapper/annotated_commit_wrapper.cpp Outdated
return res ? res : std::string_view{};
}

annotated_commit_list_wrapper::annotated_commit_list_wrapper(std::vector<annotated_commit_wrapper> annotated_commit_list)

ianthomas23 Oct 29, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Now that we have multiple whatever_list_wrapper classes there is probably a way we can move the generic vector functionality into a single templated class that we inherit from. But that can be future work.

ianthomas23 Oct 30, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

The new list_wrapper is really nice, thanks!

Comment thread src/wrapper/annotated_commit_wrapper.hpp Outdated
Comment thread src/wrapper/commit_wrapper.cpp Outdated
Comment thread src/subcommand/merge_subcommand.cpp Outdated
Comment thread src/wrapper/repository_wrapper.hpp Outdated
Comment thread src/wrapper/signature_wrapper.hpp Outdated

ianthomas23 commented Oct 29, 2025

Copy link
Copy Markdown
Member

I think that checkout_subcommand::resolve_local_ref can be removed now that this function is in the repository_wrapper class.

JohanMabille reviewed Oct 29, 2025
View reviewed changes
Comment thread src/subcommand/merge_subcommand.cpp Outdated
Comment thread src/wrapper/repository_wrapper.hpp Outdated
Comment thread src/wrapper/repository_wrapper.hpp Outdated
Comment thread src/wrapper/refs_wrapper.cpp Outdated
Comment thread src/wrapper/repository_wrapper.hpp Outdated
Comment thread src/wrapper/signature_wrapper.hpp Outdated
Comment thread src/subcommand/merge_subcommand.cpp Outdated
Comment thread src/subcommand/merge_subcommand.cpp Outdated
JohanMabille approved these changes Oct 29, 2025
View reviewed changes

JohanMabille left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

LGTM

ianthomas23 approved these changes Oct 30, 2025
View reviewed changes

ianthomas23 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Thanks @SandrineP

ianthomas23 merged commit 69b86a4 into QuantStack:main Oct 30, 2025
1 check passed
SandrineP deleted the merge_sc branch October 30, 2025 09:31
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
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

ianthomas23 ianthomas23 approved these changes
JohanMabille JohanMabille approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

Back | FazBrowse Home | New Git URL