Commit d05e2c64 by nulltoken

refspec: expose the force update specifier through git_refspec_force() accessor

parent 1835c51f
...@@ -36,6 +36,14 @@ GIT_EXTERN(const char *) git_refspec_src(const git_refspec *refspec); ...@@ -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); 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 * Check if a refspec's source descriptor matches a reference
* *
* @param refspec the refspec * @param refspec the refspec
......
...@@ -53,6 +53,13 @@ const char *git_refspec_dst(const git_refspec *refspec) ...@@ -53,6 +53,13 @@ const char *git_refspec_dst(const git_refspec *refspec)
return refspec == NULL ? NULL : refspec->dst; 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) int git_refspec_src_matches(const git_refspec *refspec, const char *refname)
{ {
if (refspec == NULL || refspec->src == NULL) if (refspec == NULL || refspec->src == NULL)
......
...@@ -189,6 +189,8 @@ int git_remote_save(const git_remote *remote) ...@@ -189,6 +189,8 @@ int git_remote_save(const git_remote *remote)
git_buf_clear(&buf); git_buf_clear(&buf);
git_buf_clear(&value); git_buf_clear(&value);
git_buf_printf(&buf, "remote.%s.fetch", remote->name); 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); git_buf_printf(&value, "%s:%s", remote->fetch.src, remote->fetch.dst);
if (git_buf_oom(&buf) || git_buf_oom(&value)) if (git_buf_oom(&buf) || git_buf_oom(&value))
return -1; return -1;
...@@ -201,6 +203,8 @@ int git_remote_save(const git_remote *remote) ...@@ -201,6 +203,8 @@ int git_remote_save(const git_remote *remote)
git_buf_clear(&buf); git_buf_clear(&buf);
git_buf_clear(&value); git_buf_clear(&value);
git_buf_printf(&buf, "remote.%s.push", remote->name); 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); git_buf_printf(&value, "%s:%s", remote->push.src, remote->push.dst);
if (git_buf_oom(&buf) || git_buf_oom(&value)) if (git_buf_oom(&buf) || git_buf_oom(&value))
return -1; return -1;
......
...@@ -92,6 +92,7 @@ void test_network_remotes__save(void) ...@@ -92,6 +92,7 @@ void test_network_remotes__save(void)
cl_assert(_refspec != NULL); cl_assert(_refspec != NULL);
cl_assert_equal_s(git_refspec_src(_refspec), "refs/heads/*"); cl_assert_equal_s(git_refspec_src(_refspec), "refs/heads/*");
cl_assert_equal_s(git_refspec_dst(_refspec), "refs/remotes/upstream/*"); cl_assert_equal_s(git_refspec_dst(_refspec), "refs/remotes/upstream/*");
cl_assert(git_refspec_force(_refspec) == 0);
_refspec = git_remote_pushspec(_remote); _refspec = git_remote_pushspec(_remote);
cl_assert(_refspec != NULL); cl_assert(_refspec != NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment