Skip to content
This repository was archived by the owner on Jan 19, 2021. It is now read-only.

Commit fbd99bf

Browse files
committed
Namespace for fetch conflict
1 parent 0438394 commit fbd99bf

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1462,7 +1462,7 @@ The project is available under the [MIT](https://opensource.org/licenses/MIT) li
14621462
| `git_remote_disconnect` | `remote::disconnect` |
14631463
| `git_remote_download` | `remote::download` |
14641464
| `git_remote_dup` | `remote::copy` |
1465-
| `git_remote_fetch` | `remote::fetch` |
1465+
| `git_remote_fetch` | `remote::fetch_data` |
14661466
| `git_remote_free` | `remote::~remote` |
14671467
| `git_remote_get_fetch_refspecs` | `remote::fetch_refspec` |
14681468
| `git_remote_get_push_refspecs` | `remote::push_refspec` |

include/cppgit2/remote.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class remote : public libgit2_api {
149149
const fetch::options &options = fetch::options());
150150

151151
// Download new data and update tips
152-
void fetch(const strarray &refspecs, const std::string &reflog_message,
152+
void fetch_data(const strarray &refspecs, const std::string &reflog_message,
153153
const cppgit2::fetch::options &options = cppgit2::fetch::options());
154154

155155
// Get the remote's list of fetch refspecs

src/remote.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void remote::download(const strarray &refspecs, const fetch::options &options) {
7474
throw git_exception();
7575
}
7676

77-
void remote::fetch(const strarray &refspecs, const std::string &reflog_message,
77+
void remote::fetch_data(const strarray &refspecs, const std::string &reflog_message,
7878
const fetch::options &options) {
7979
if (git_remote_fetch(c_ptr_, refspecs.c_ptr(), options.c_ptr(),
8080
reflog_message.c_str()))

0 commit comments

Comments
 (0)