diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2012-05-30 00:27:22 +0200 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2012-05-30 01:05:17 +0200 |
| commit | d05e2c64dd93da7219c9ebca18c2f3b8478ca93a (patch) | |
| tree | dcb6e7f324084e08e812ce96272ee5985fe94514 | |
| parent | 1835c51f58a670e23c9546f942259d53fe626fa2 (diff) | |
| download | libgit2-d05e2c64dd93da7219c9ebca18c2f3b8478ca93a.tar.gz | |
refspec: expose the force update specifier through git_refspec_force() accessor
| -rw-r--r-- | include/git2/refspec.h | 8 | ||||
| -rw-r--r-- | src/refspec.c | 7 | ||||
| -rw-r--r-- | src/remote.c | 4 | ||||
| -rw-r--r-- | tests-clar/network/remotes.c | 1 |
4 files changed, 20 insertions, 0 deletions
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 @@ -36,6 +36,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 * * @param refspec the refspec 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); |