From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Aug 2011 04:19:21 +0000 (-0700)
Subject: Merge branch 'jc/maint-clone-alternates'
X-Git-Tag: v1.7.7-rc1~38
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2478bd8318c3ad6eceb7b99f01db29499f63b759;p=git.git

Merge branch 'jc/maint-clone-alternates'

* jc/maint-clone-alternates:
  clone: clone from a repository with relative alternates
  clone: allow more than one --reference

Conflicts:
	builtin/clone.c
---

2478bd8318c3ad6eceb7b99f01db29499f63b759
diff --cc builtin/clone.c
index 7663bc22c,16b4fba71..4d66a7f4e
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@@ -46,7 -46,16 +46,17 @@@ static const char *real_git_dir
  static char *option_upload_pack = "git-upload-pack";
  static int option_verbosity;
  static int option_progress;
 +static struct string_list option_config;
+ static struct string_list option_reference;
+ 
+ static int opt_parse_reference(const struct option *opt, const char *arg, int unset)
+ {
+ 	struct string_list *option_reference = opt->value;
+ 	if (!arg)
+ 		return -1;
+ 	string_list_append(option_reference, arg);
+ 	return 0;
+ }
  
  static struct option builtin_clone_options[] = {
  	OPT__VERBOSITY(&option_verbosity),