我查看了这篇帖子中的答案 (libgit2 (fetch & merge & commit)),但是我无法让Git Pull工作。我没有收到错误消息。Fetch似乎正常工作,但合并没有发生。执行Git Status后显示我的分支落后1个提交...
On branch Branch_1_1.
Your branch is behind 'origin/Branch_1_1' by 1 commit, and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working directory clean
我的代码如下...
static int fetchhead_ref_cb(const char *name, const char *url,
const git_oid *oid, unsigned int is_merge, void *payload)
{
if ( is_merge )
{
strcpy_s( branchToMerge, 100, name );
memcpy( &branchOidToMerge, oid, sizeof( git_oid ) );
}
return 0;
}
void GitPull()
{
git_libgit2_init();
git_repository *repo = NULL;
git_remote *remote;
int error = git_repository_open( &repo, "C:\\work\\GitTestRepos\\Repo1" );
CHECK_FOR_ERROR
error = git_remote_lookup( &remote, repo, "origin" );
CHECK_FOR_ERROR
git_fetch_options options = GIT_FETCH_OPTIONS_INIT;
error = git_remote_fetch( remote, NULL, &options, NULL );
CHECK_FOR_ERROR
git_repository_fetchhead_foreach( repo, fetchhead_ref_cb, NULL );
git_merge_options merge_options = GIT_MERGE_OPTIONS_INIT;
git_checkout_options checkout_options = GIT_CHECKOUT_OPTIONS_INIT;
git_annotated_commit *heads[ 1 ];
git_reference *ref;
error = git_annotated_commit_lookup( &heads[ 0 ], repo, &branchOidToMerge );
CHECK_FOR_ERROR
error = git_merge( repo, (const git_annotated_commit **)heads, 1, &merge_options, &checkout_options );
CHECK_FOR_ERROR
git_annotated_commit_free( heads[ 0 ] );
git_repository_state_cleanup( repo );
git_libgit2_shutdown();
}
我做了什么导致合并无法工作?
git_reference_set_target()
,它不会像git pull
一样更新工作树。 - Timmmmgit_checkout_options.checkout_strategy
的奇怪行为并打开了这个错误报告:https://github.com/libgit2/libgit2/issues/5803。看起来默认设置适用于一些非干运行操作,如`git_apply`。 - Aaron Franke