summaryrefslogtreecommitdiff
path: root/remote.h
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2016-02-16 10:47:50 +0100
committerJunio C Hamano <gitster@pobox.com>2016-02-16 13:33:12 -0800
commit674468b3642abfff7c61d5ff95fffc43b87f70b7 (patch)
treebf6ab75ebd17f9588b52673007ff1b15f19bf65d /remote.h
parentbc60f8a77c6e676225810f33117abcf9117b1c1e (diff)
downloadgit-674468b3642abfff7c61d5ff95fffc43b87f70b7.tar.gz
remote: simplify remote_is_configured()
The remote_is_configured() function allows checking whether a remote exists or not. The function however only works if remote_get() wasn't called before calling it. In addition, it only checks the configuration for remotes, but not remotes or branches files. Make use of the origin member of struct remote instead, which indicates where the remote comes from. It will be set to some value if the remote is configured in any file in the repository, but is initialized to 0 if the remote is only created in make_remote(). Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote.h')
-rw-r--r--remote.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/remote.h b/remote.h
index 4fd7a0f9b2..c21fd3788c 100644
--- a/remote.h
+++ b/remote.h
@@ -5,6 +5,7 @@
#include "hashmap.h"
enum {
+ REMOTE_UNCONFIGURED = 0,
REMOTE_CONFIG,
REMOTE_REMOTES,
REMOTE_BRANCHES
@@ -59,7 +60,7 @@ struct remote {
struct remote *remote_get(const char *name);
struct remote *pushremote_get(const char *name);
-int remote_is_configured(const char *name);
+int remote_is_configured(struct remote *remote);
typedef int each_remote_fn(struct remote *remote, void *priv);
int for_each_remote(each_remote_fn fn, void *priv);