Commit fb39b3a54cfedd1e414dc86f6ff5f9af9190c97b
2012-10-02T14:36:59
refspec: introduce git_refspec__serialize()
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
diff --git a/src/refspec.c b/src/refspec.c
index b1790b3..8b69e9d 100644
--- a/src/refspec.c
+++ b/src/refspec.c
@@ -225,3 +225,14 @@ int git_refspec_transform_l(git_buf *out, const git_refspec *spec, const char *n
return refspec_transform(out, spec->dst, spec->src, name);
}
+int git_refspec__serialize(git_buf *out, const git_refspec *refspec)
+{
+ if (refspec->force)
+ git_buf_putc(out, '+');
+
+ git_buf_printf(out, "%s:%s",
+ refspec->src != NULL ? refspec->src : "",
+ refspec->dst != NULL ? refspec->dst : "");
+
+ return git_buf_oom(out) == false;
+}
diff --git a/src/refspec.h b/src/refspec.h
index 6e0596a..40da16a 100644
--- a/src/refspec.h
+++ b/src/refspec.h
@@ -51,4 +51,6 @@ int git_refspec_transform_r(git_buf *out, const git_refspec *spec, const char *n
*/
int git_refspec_transform_l(git_buf *out, const git_refspec *spec, const char *name);
+int git_refspec__serialize(git_buf *out, const git_refspec *refspec);
+
#endif
diff --git a/src/remote.c b/src/remote.c
index 1e1cc38..3506d5f 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -237,17 +237,14 @@ static int update_config_refspec(
if (refspec->src == NULL || refspec->dst == NULL)
return 0;
- git_buf_printf(
+ if (git_buf_printf(
&name,
"remote.%s.%s",
remote_name,
- git_direction == GIT_DIR_FETCH ? "fetch" : "push");
+ git_direction == GIT_DIR_FETCH ? "fetch" : "push") < 0)
+ goto cleanup;
- if (refspec->force)
- git_buf_putc(&value, '+');
- git_buf_printf(&value, "%s:%s", refspec->src, refspec->dst);
-
- if (git_buf_oom(&name) || git_buf_oom(&value))
+ if (git_refspec__serialize(&value, refspec) < 0)
goto cleanup;
error = git_config_set_string(