From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 11 Sep 2012 18:36:18 +0000 (-0700)
Subject: Merge branch 'jk/argv-array'
X-Git-Tag: v1.8.0-rc0~77
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=871313c35851e85a58c4012c02a806890c671813;p=git.git

Merge branch 'jk/argv-array'

Use argv-array API in "git fetch" implementation.

* jk/argv-array:
  submodule: use argv_array instead of hand-building arrays
  fetch: use argv_array instead of hand-building arrays
  argv-array: fix bogus cast when freeing array
  argv-array: add pop function
---

871313c35851e85a58c4012c02a806890c671813
diff --cc builtin/fetch.c
index 97a849a9d,6196e9179..24be754e1
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -14,12 -14,13 +14,13 @@@
  #include "transport.h"
  #include "submodule.h"
  #include "connected.h"
+ #include "argv-array.h"
  
  static const char * const builtin_fetch_usage[] = {
 -	"git fetch [<options>] [<repository> [<refspec>...]]",
 -	"git fetch [<options>] <group>",
 -	"git fetch --multiple [<options>] [(<repository> | <group>)...]",
 -	"git fetch --all [<options>]",
 +	N_("git fetch [<options>] [<repository> [<refspec>...]]"),
 +	N_("git fetch [<options>] <group>"),
 +	N_("git fetch --multiple [<options>] [(<repository> | <group>)...]"),
 +	N_("git fetch --all [<options>]"),
  	NULL
  };