From 096d9e94aa9e19669e778c8644ccfa7f41f98eaf Mon Sep 17 00:00:00 2001
From: nulltoken <emeric.fermas@gmail.com>
Date: Sun, 7 Oct 2012 21:00:46 +0200
Subject: [PATCH] remote: use constants for well-known names

---
 src/clone.c      | 4 ++--
 src/remote.h     | 2 ++
 src/repository.c | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/clone.c b/src/clone.c
index 9dfc22c59..211288c2c 100644
--- a/src/clone.c
+++ b/src/clone.c
@@ -51,7 +51,7 @@ static int create_tracking_branch(git_repository *repo, const git_oid *target, c
 			if (!git_buf_printf(&remote, "branch.%s.remote", name) &&
 				 !git_buf_printf(&merge, "branch.%s.merge", name) &&
 				 !git_buf_printf(&merge_target, GIT_REFS_HEADS_DIR "%s", name) &&
-				 !git_config_set_string(cfg, git_buf_cstr(&remote), "origin") &&
+				 !git_config_set_string(cfg, git_buf_cstr(&remote), GIT_REMOTE_ORIGIN) &&
 				 !git_config_set_string(cfg, git_buf_cstr(&merge), git_buf_cstr(&merge_target))) {
 				retcode = 0;
 			}
@@ -150,7 +150,7 @@ static int setup_remotes_and_fetch(git_repository *repo,
 	if (!fetch_stats) fetch_stats = &dummy_stats;
 
 	/* Create the "origin" remote */
-	if (!git_remote_add(&origin, repo, "origin", origin_url)) {
+	if (!git_remote_add(&origin, repo, GIT_REMOTE_ORIGIN, origin_url)) {
 		/* Connect and download everything */
 		if (!git_remote_connect(origin, GIT_DIR_FETCH)) {
 			if (!git_remote_download(origin, &bytes, fetch_stats)) {
diff --git a/src/remote.h b/src/remote.h
index b8bb2c55d..05073db8c 100644
--- a/src/remote.h
+++ b/src/remote.h
@@ -13,6 +13,8 @@
 #include "transport.h"
 #include "repository.h"
 
+#define GIT_REMOTE_ORIGIN "origin"
+
 struct git_remote {
 	char *name;
 	char *url;
diff --git a/src/repository.c b/src/repository.c
index 1641129d3..1b49228fb 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -19,6 +19,7 @@
 #include "refs.h"
 #include "filter.h"
 #include "odb.h"
+#include "remote.h"
 
 #define GIT_FILE_CONTENT_PREFIX "gitdir:"
 
@@ -1095,7 +1096,7 @@ static int repo_init_create_origin(git_repository *repo, const char *url)
 	int error;
 	git_remote *remote;
 
-	if (!(error = git_remote_add(&remote, repo, "origin", url))) {
+	if (!(error = git_remote_add(&remote, repo, GIT_REMOTE_ORIGIN, url))) {
 		error = git_remote_save(remote);
 		git_remote_free(remote);
 	}