small fix

SandrineP · SandrineP · commit 687ffb1e0eb2 · 2025-12-03T11:46:45.000+01:00
diff --git a/src/subcommand/merge_subcommand.cpp b/src/subcommand/merge_subcommand.cpp
@@ -39,7 +39,7 @@ annotated_commit_list_wrapper merge_subcommand::resolve_heads(const repository_w
     return annotated_commit_list_wrapper(std::move(commits_to_merge));
 }
 
-annotated_commit_list_wrapper resolve_mergeheads(const repository_wrapper& repo, const std::vector<git_oid> oid_list)
+annotated_commit_list_wrapper resolve_mergeheads(const repository_wrapper& repo, const std::vector<git_oid>& oid_list)
 {
     std::vector<annotated_commit_wrapper> commits_to_merge;
     commits_to_merge.reserve(oid_list.size());
@@ -82,7 +82,7 @@ void perform_fastforward(repository_wrapper& repo, const git_oid& target_oid, in
 void merge_subcommand::create_merge_commit(
     repository_wrapper& repo,
     const index_wrapper& index,
-    const std::vector<std::string> branches_to_merge,
+    const std::vector<std::string>& branches_to_merge,
     const annotated_commit_list_wrapper& commits_to_merge,
     size_t num_commits_to_merge)
 {
diff --git a/src/subcommand/merge_subcommand.hpp b/src/subcommand/merge_subcommand.hpp
@@ -18,7 +18,7 @@ class merge_subcommand
     void create_merge_commit(
         repository_wrapper& repo,
         const index_wrapper& index,
-        const std::vector<std::string> branches_to_merge,
+        const std::vector<std::string>& branches_to_merge,
         const annotated_commit_list_wrapper& commits_to_merge,
         size_t num_commits_to_merge);
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ annotated_commit_list_wrapper merge_subcommand::resolve_heads(const repository_w`
`39`	`39`	`return annotated_commit_list_wrapper(std::move(commits_to_merge));`
`40`	`40`	`}`
`41`	`41`
`42`		`-annotated_commit_list_wrapper resolve_mergeheads(const repository_wrapper& repo, const std::vector<git_oid> oid_list)`
	`42`	`+annotated_commit_list_wrapper resolve_mergeheads(const repository_wrapper& repo, const std::vector<git_oid>& oid_list)`
`43`	`43`	`{`
`44`	`44`	`std::vector<annotated_commit_wrapper> commits_to_merge;`
`45`	`45`	`commits_to_merge.reserve(oid_list.size());`
`@@ -82,7 +82,7 @@ void perform_fastforward(repository_wrapper& repo, const git_oid& target_oid, in`
`82`	`82`	`void merge_subcommand::create_merge_commit(`
`83`	`83`	`repository_wrapper& repo,`
`84`	`84`	`const index_wrapper& index,`
`85`		`- const std::vector<std::string> branches_to_merge,`
	`85`	`+ const std::vector<std::string>& branches_to_merge,`
`86`	`86`	`const annotated_commit_list_wrapper& commits_to_merge,`
`87`	`87`	`size_t num_commits_to_merge)`
`88`	`88`	`{`