Merge branch 'jk/argv-array'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:36:18 +0000 (11:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:36:18 +0000 (11:36 -0700)
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

1  2 
builtin/fetch.c
submodule.c

diff --cc builtin/fetch.c
index 97a849a9dc082555fe1cbe6d0216d03563c75951,6196e91798dd075800b24d8b9129f0321f7b7338..24be754e1b4444ea46752016ba77bdef1c892712
  #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
  };
  
diff --cc submodule.c
Simple merge