From d05e2c64dd93da7219c9ebca18c2f3b8478ca93a Mon Sep 17 00:00:00 2001 From: nulltoken Date: Wed, 30 May 2012 00:27:22 +0200 Subject: [PATCH 1/2] refspec: expose the force update specifier through git_refspec_force() accessor --- include/git2/refspec.h | 8 ++++++++ src/refspec.c | 7 +++++++ src/remote.c | 4 ++++ tests-clar/network/remotes.c | 1 + 4 files changed, 20 insertions(+) diff --git a/include/git2/refspec.h b/include/git2/refspec.h index c0a8eabfe..1100e9022 100644 --- a/include/git2/refspec.h +++ b/include/git2/refspec.h @@ -35,6 +35,14 @@ GIT_EXTERN(const char *) git_refspec_src(const git_refspec *refspec); */ GIT_EXTERN(const char *) git_refspec_dst(const git_refspec *refspec); +/** + * Get the force update setting + * + * @param refspec the refspec + * @return 1 if force update has been set, 0 otherwise + */ +GIT_EXTERN(int) git_refspec_force(const git_refspec *refspec); + /** * Check if a refspec's source descriptor matches a reference * diff --git a/src/refspec.c b/src/refspec.c index 697b1bf87..b6b1158b7 100644 --- a/src/refspec.c +++ b/src/refspec.c @@ -53,6 +53,13 @@ const char *git_refspec_dst(const git_refspec *refspec) return refspec == NULL ? NULL : refspec->dst; } +int git_refspec_force(const git_refspec *refspec) +{ + assert(refspec); + + return refspec->force; +} + int git_refspec_src_matches(const git_refspec *refspec, const char *refname) { if (refspec == NULL || refspec->src == NULL) diff --git a/src/remote.c b/src/remote.c index 9740344f8..deb73508d 100644 --- a/src/remote.c +++ b/src/remote.c @@ -189,6 +189,8 @@ int git_remote_save(const git_remote *remote) git_buf_clear(&buf); git_buf_clear(&value); git_buf_printf(&buf, "remote.%s.fetch", remote->name); + if (remote->fetch.force) + git_buf_putc(&value, '+'); git_buf_printf(&value, "%s:%s", remote->fetch.src, remote->fetch.dst); if (git_buf_oom(&buf) || git_buf_oom(&value)) return -1; @@ -201,6 +203,8 @@ int git_remote_save(const git_remote *remote) git_buf_clear(&buf); git_buf_clear(&value); git_buf_printf(&buf, "remote.%s.push", remote->name); + if (remote->push.force) + git_buf_putc(&value, '+'); git_buf_printf(&value, "%s:%s", remote->push.src, remote->push.dst); if (git_buf_oom(&buf) || git_buf_oom(&value)) return -1; diff --git a/tests-clar/network/remotes.c b/tests-clar/network/remotes.c index 0649c86dd..b3a0265e6 100644 --- a/tests-clar/network/remotes.c +++ b/tests-clar/network/remotes.c @@ -92,6 +92,7 @@ void test_network_remotes__save(void) cl_assert(_refspec != NULL); cl_assert_equal_s(git_refspec_src(_refspec), "refs/heads/*"); cl_assert_equal_s(git_refspec_dst(_refspec), "refs/remotes/upstream/*"); + cl_assert(git_refspec_force(_refspec) == 0); _refspec = git_remote_pushspec(_remote); cl_assert(_refspec != NULL); From d27bf6656158c6be1eca7e8c5e87b4d39958b18d Mon Sep 17 00:00:00 2001 From: nulltoken Date: Wed, 30 May 2012 00:50:39 +0200 Subject: [PATCH 2/2] remote: Make git_remote_add() generate a default refspec with a force update specifier --- src/remote.c | 2 +- tests-clar/network/remotes.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/remote.c b/src/remote.c index deb73508d..5993ad02b 100644 --- a/src/remote.c +++ b/src/remote.c @@ -494,7 +494,7 @@ int git_remote_add(git_remote **out, git_repository *repo, const char *name, con { git_buf buf = GIT_BUF_INIT; - if (git_buf_printf(&buf, "refs/heads/*:refs/remotes/%s/*", name) < 0) + if (git_buf_printf(&buf, "+refs/heads/*:refs/remotes/%s/*", name) < 0) return -1; if (git_remote_new(out, repo, name, url, git_buf_cstr(&buf)) < 0) diff --git a/tests-clar/network/remotes.c b/tests-clar/network/remotes.c index b3a0265e6..3f631835c 100644 --- a/tests-clar/network/remotes.c +++ b/tests-clar/network/remotes.c @@ -160,6 +160,15 @@ void test_network_remotes__loading_a_missing_remote_returns_ENOTFOUND(void) cl_assert_equal_i(GIT_ENOTFOUND, git_remote_load(&_remote, _repo, "just-left-few-minutes-ago")); } +/* + * $ git remote add addtest http://github.com/libgit2/libgit2 + * + * $ cat .git/config + * [...] + * [remote "addtest"] + * url = http://github.com/libgit2/libgit2 + * fetch = +refs/heads/*:refs/remotes/addtest/* + */ void test_network_remotes__add(void) { git_remote_free(_remote); @@ -169,5 +178,6 @@ void test_network_remotes__add(void) cl_git_pass(git_remote_load(&_remote, _repo, "addtest")); _refspec = git_remote_fetchspec(_remote); cl_assert(!strcmp(git_refspec_src(_refspec), "refs/heads/*")); + cl_assert(git_refspec_force(_refspec) == 1); cl_assert(!strcmp(git_refspec_dst(_refspec), "refs/remotes/addtest/*")); }