Commit 2dc31040a25548c0cc224edc1ec3880dc16a9ca9
2011-06-20T18:58:57
Abstract the refspec query and parse Move them to their own functions to avoid duplication and to make it easier to ignore missing configuration. Not finding 'fetch' is considered fatal, though this might not be correct behaviour (push-only remotes?) Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
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 57 58 59
diff --git a/include/git2.h b/include/git2.h
index e04b0bd..6ede73c 100644
--- a/include/git2.h
+++ b/include/git2.h
@@ -53,6 +53,7 @@
#include "git2/index.h"
#include "git2/config.h"
+#include "git2/remote.h"
#include "git2/remote.h"
#include "git2/refspec.h"
diff --git a/src/remote.c b/src/remote.c
index 7da6e65..aa22deb 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -69,7 +69,7 @@ static int parse_remote_refspec(git_config *cfg, git_refspec *refspec, const cha
if (error < GIT_SUCCESS)
return error;
- return git_refspec_parse(refspec, val);
+ return refspec_parse(refspec, val);
}
int git_remote_get(git_remote **out, git_config *cfg, const char *name)
@@ -122,13 +122,11 @@ int git_remote_get(git_remote **out, git_config *cfg, const char *name)
goto cleanup;
}
- error = git_config_get_string(cfg, buf, &val);
- if (error < GIT_SUCCESS)
- goto cleanup;
-
- error = refspec_parse(&remote->fetch, val);
- if (error < GIT_SUCCESS)
+ error = parse_remote_refspec(cfg, &remote->fetch, buf);
+ if (error < GIT_SUCCESS) {
+ error = git__rethrow(error, "Failed to get fetch refspec");
goto cleanup;
+ }
ret = snprintf(buf, buf_len, "%s.%s.%s", "remote", name, "push");
if (ret < 0) {
@@ -136,11 +134,11 @@ int git_remote_get(git_remote **out, git_config *cfg, const char *name)
goto cleanup;
}
- error = git_config_get_string(cfg, buf, &val);
- if (error < GIT_SUCCESS)
- goto cleanup;
+ error = parse_remote_refspec(cfg, &remote->push, buf);
+ /* Not finding push is fine */
+ if (error == GIT_ENOTFOUND)
+ error = GIT_SUCCESS;
- error = refspec_parse(&remote->push, val);
if (error < GIT_SUCCESS)
goto cleanup;