summaryrefslogtreecommitdiff
path: root/builtin-push.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-04-30 12:05:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-30 22:42:09 (GMT)
commit5c477b972583e96b65ef1613c5d0fb1b90af3d0e (patch)
treec9d997945da29eb05501a32ef796dd71c825a9ff /builtin-push.c
parent755225de6ce4c7b39137afefb35208d0dbc14d9d (diff)
downloadgit-5c477b972583e96b65ef1613c5d0fb1b90af3d0e.zip
git-5c477b972583e96b65ef1613c5d0fb1b90af3d0e.tar.gz
git-5c477b972583e96b65ef1613c5d0fb1b90af3d0e.tar.bz2
builtin-push: resurrect parsing of Push: lines
The C'ification of push left these behind. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-push.c')
-rw-r--r--builtin-push.c26
1 files changed, 21 insertions, 5 deletions
diff --git a/builtin-push.c b/builtin-push.c
index a0c1caa..4e659f0 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -68,6 +68,10 @@ static void set_refspecs(const char **refs, int nr)
expand_refspecs();
}
+#define MAX_REFSPECS 10
+static int current_refspec = 0;
+static char *refspecs_[MAX_REFSPECS];
+
static int get_remotes_uri(const char *repo, const char *uri[MAX_URI])
{
int n = 0;
@@ -76,11 +80,17 @@ static int get_remotes_uri(const char *repo, const char *uri[MAX_URI])
if (!f)
return -1;
while (fgets(buffer, BUF_SIZE, f)) {
+ int is_refspec;
char *s, *p;
- if (strncmp("URL: ", buffer, 5))
+ if (!strncmp("URL: ", buffer, 5)) {
+ is_refspec = 0;
+ s = buffer + 5;
+ } else if (!strncmp("Push: ", buffer, 6)) {
+ is_refspec = 1;
+ s = buffer + 6;
+ } else
continue;
- s = buffer + 5;
/* Remove whitespace at the head.. */
while (isspace(*s))
@@ -93,9 +103,10 @@ static int get_remotes_uri(const char *repo, const char *uri[MAX_URI])
while (isspace(p[-1]))
*--p = 0;
- uri[n++] = strdup(s);
- if (n == MAX_URI)
- break;
+ if (!is_refspec && n < MAX_URI)
+ uri[n++] = strdup(s);
+ else if (is_refspec && current_refspec < MAX_REFSPECS)
+ refspecs_[current_refspec++] = strdup(s);
}
fclose(f);
if (!n)
@@ -140,6 +151,8 @@ static int get_uri(const char *repo, const char *uri[MAX_URI])
int n;
if (*repo != '/') {
+ current_refspec = 0;
+
n = get_remotes_uri(repo, uri);
if (n > 0)
return n;
@@ -165,6 +178,9 @@ static int do_push(const char *repo)
if (n <= 0)
die("bad repository '%s'", repo);
+ if (refspec_nr == 0)
+ set_refspecs((const char**)refspecs_, current_refspec);
+
argv = xmalloc((refspec_nr + 10) * sizeof(char *));
argv[0] = "dummy-send-pack";
argc = 1;