X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=send-pack.c;h=10bc8bc35935c6ba3af70456781d6194c55ba274;hb=24cf6e5847073d50390e0b7950e8e6b5a09103bc;hp=f5583861433517527943dcefb3320e923fe634a0;hpb=f6b39fe779bc72d49aa30936c6371d76401fc753;p=git.git

diff --git a/send-pack.c b/send-pack.c
index f55838614..10bc8bc35 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -27,7 +27,7 @@ static int is_zero_sha1(const unsigned char *sha1)
 
 static void exec_pack_objects(void)
 {
-	static char *args[] = {
+	static const char *args[] = {
 		"pack-objects",
 		"--stdout",
 		NULL
@@ -39,7 +39,7 @@ static void exec_pack_objects(void)
 static void exec_rev_list(struct ref *refs)
 {
 	struct ref *ref;
-	static char *args[1000];
+	static const char *args[1000];
 	int i = 0, j;
 
 	args[i++] = "rev-list";	/* 0 */
@@ -151,12 +151,12 @@ static int ref_newer(const unsigned char *new_sha1,
 	 * old.  Otherwise we require --force.
 	 */
 	o = deref_tag(parse_object(old_sha1), NULL, 0);
-	if (!o || o->type != commit_type)
+	if (!o || o->type != OBJ_COMMIT)
 		return 0;
 	old = (struct commit *) o;
 
 	o = deref_tag(parse_object(new_sha1), NULL, 0);
-	if (!o || o->type != commit_type)
+	if (!o || o->type != OBJ_COMMIT)
 		return 0;
 	new = (struct commit *) o;
 
@@ -239,7 +239,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec)
 	int expect_status_report = 0;
 
 	/* No funny business with the matcher */
-	remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, 1);
+	remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
 	get_local_heads();
 
 	/* Does the other end support the reporting? */
@@ -362,6 +362,8 @@ int main(int argc, char **argv)
 	pid_t pid;
 
 	setup_git_directory();
+	git_config(git_default_config);
+
 	argv++;
 	for (i = 1; i < argc; i++, argv++) {
 		char *arg = *argv;