From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 13 Sep 2009 08:31:55 +0000 (-0700)
Subject: Merge branch 'db/vcs-helper'
X-Git-Tag: v1.6.5-rc1~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cd03eebbfdae712bd4a10d6b393980a8137ce305;p=git.git

Merge branch 'db/vcs-helper'

* db/vcs-helper:
  Makefile: remove remnant of separate http/https/ftp helpers
  Use a clearer style to issue commands to remote helpers
  Make the "traditionally-supported" URLs a special case
  Makefile: install hardlinks for git-remote-<scheme> supported by libcurl if possible
  Makefile: do not link three copies of git-remote-* programs
  Makefile: git-http-fetch does not need expat
  http-fetch: Fix Makefile dependancies
  Add transport native helper executables to .gitignore
  git-http-fetch: not a builtin
  Use an external program to implement fetching with curl
  Add support for external programs for handling native fetches
---

cd03eebbfdae712bd4a10d6b393980a8137ce305
diff --cc .gitignore
index 10808e3a7,46c26cd01..47672b0c1
--- a/.gitignore
+++ b/.gitignore
@@@ -104,8 -104,8 +104,9 @@@ git-receive-pac
  git-reflog
  git-relink
  git-remote
+ git-remote-curl
  git-repack
 +git-replace
  git-repo-config
  git-request-pull
  git-rerere
diff --cc transport.c
index d6c35d91c,b654d71d5..4cb807700
--- a/transport.c
+++ b/transport.c
@@@ -415,99 -374,22 +373,9 @@@ static int curl_transport_push(struct t
  	while (refspec_nr--)
  		argv[argc++] = *refspec++;
  	argv[argc] = NULL;
 -	err = run_command_v_opt(argv, RUN_GIT_CMD);
 -	switch (err) {
 -	case -ERR_RUN_COMMAND_FORK:
 -		error("unable to fork for %s", argv[0]);
 -	case -ERR_RUN_COMMAND_EXEC:
 -		error("unable to exec %s", argv[0]);
 -		break;
 -	case -ERR_RUN_COMMAND_WAITPID:
 -	case -ERR_RUN_COMMAND_WAITPID_WRONG_PID:
 -	case -ERR_RUN_COMMAND_WAITPID_SIGNAL:
 -	case -ERR_RUN_COMMAND_WAITPID_NOEXIT:
 -		error("%s died with strange error", argv[0]);
 -	}
 -	return !!err;
 +	return !!run_command_v_opt(argv, RUN_GIT_CMD);
  }
  
- static struct ref *get_refs_via_curl(struct transport *transport, int for_push)
- {
- 	struct strbuf buffer = STRBUF_INIT;
- 	char *data, *start, *mid;
- 	char *ref_name;
- 	char *refs_url;
- 	int i = 0;
- 	int http_ret;
- 
- 	struct ref *refs = NULL;
- 	struct ref *ref = NULL;
- 	struct ref *last_ref = NULL;
- 
- 	struct walker *walker;
- 
- 	if (for_push)
- 		return NULL;
- 
- 	if (!transport->data)
- 		transport->data = get_http_walker(transport->url,
- 						transport->remote);
- 
- 	walker = transport->data;
- 
- 	refs_url = xmalloc(strlen(transport->url) + 11);
- 	sprintf(refs_url, "%s/info/refs", transport->url);
- 
- 	http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE);
- 	switch (http_ret) {
- 	case HTTP_OK:
- 		break;
- 	case HTTP_MISSING_TARGET:
- 		die("%s not found: did you run git update-server-info on the"
- 		    " server?", refs_url);
- 	default:
- 		http_error(refs_url, http_ret);
- 		die("HTTP request failed");
- 	}
- 
- 	data = buffer.buf;
- 	start = NULL;
- 	mid = data;
- 	while (i < buffer.len) {
- 		if (!start)
- 			start = &data[i];
- 		if (data[i] == '\t')
- 			mid = &data[i];
- 		if (data[i] == '\n') {
- 			data[i] = 0;
- 			ref_name = mid + 1;
- 			ref = xmalloc(sizeof(struct ref) +
- 				      strlen(ref_name) + 1);
- 			memset(ref, 0, sizeof(struct ref));
- 			strcpy(ref->name, ref_name);
- 			get_sha1_hex(start, ref->old_sha1);
- 			if (!refs)
- 				refs = ref;
- 			if (last_ref)
- 				last_ref->next = ref;
- 			last_ref = ref;
- 			start = NULL;
- 		}
- 		i++;
- 	}
- 
- 	strbuf_release(&buffer);
- 
- 	ref = alloc_ref("HEAD");
- 	if (!walker->fetch_ref(walker, ref) &&
- 	    !resolve_remote_symref(ref, refs)) {
- 		ref->next = refs;
- 		refs = ref;
- 	} else {
- 		free(ref);
- 	}
- 
- 	strbuf_release(&buffer);
- 	free(refs_url);
- 	return refs;
- }
- 
- static int fetch_objs_via_curl(struct transport *transport,
- 				 int nr_objs, const struct ref **to_fetch)
- {
- 	if (!transport->data)
- 		transport->data = get_http_walker(transport->url,
- 						transport->remote);
- 	return fetch_objs_via_walker(transport, nr_objs, to_fetch);
- }
- 
  #endif
  
  struct bundle_transport_data {