Skip to content
Browse files

refspec: expose the force update specifier through git_refspec_force(…

…) accessor
  • Loading branch information...
1 parent 1835c51 commit d05e2c64dd93da7219c9ebca18c2f3b8478ca93a @nulltoken committed May 30, 2012
Showing with 20 additions and 0 deletions.
  1. +8 −0 include/git2/refspec.h
  2. +7 −0 src/refspec.c
  3. +4 −0 src/remote.c
  4. +1 −0 tests-clar/network/remotes.c
View
8 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
View
7 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)
View
4 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;
View
1 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);

0 comments on commit d05e2c6

Please sign in to comment.
Something went wrong with that request. Please try again.