From: Jeff King <peff@peff.net>
Date: Thu, 25 Oct 2012 10:42:01 +0000 (-0400)
Subject: Merge branch 'fa/remote-svn'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=530f237500ba00c03fee23c2db599870ff62c196;p=git.git

Merge branch 'fa/remote-svn'

A GSoC project.

* fa/remote-svn:
  Add a test script for remote-svn
  remote-svn: add marks-file regeneration
  Add a svnrdump-simulator replaying a dump file for testing
  remote-svn: add incremental import
  remote-svn: Activate import/export-marks for fast-import
  Create a note for every imported commit containing svn metadata
  vcs-svn: add fast_export_note to create notes
  Allow reading svn dumps from files via file:// urls
  remote-svn, vcs-svn: Enable fetching to private refs
  When debug==1, start fast-import with "--stats" instead of "--quiet"
  Add documentation for the 'bidi-import' capability of remote-helpers
  Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability
  Add argv_array_detach and argv_array_free_detached
  Add svndump_init_fd to allow reading dumps from arbitrary FDs
  Add git-remote-testsvn to Makefile
  Implement a remote helper for svn in C
---

530f237500ba00c03fee23c2db599870ff62c196
diff --cc argv-array.h
index f4b98660f,b3ef351b4..40248d424
--- a/argv-array.h
+++ b/argv-array.h
@@@ -16,7 -16,8 +16,9 @@@ void argv_array_push(struct argv_array 
  __attribute__((format (printf,2,3)))
  void argv_array_pushf(struct argv_array *, const char *fmt, ...);
  void argv_array_pushl(struct argv_array *, ...);
 +void argv_array_pop(struct argv_array *);
  void argv_array_clear(struct argv_array *);
+ const char **argv_array_detach(struct argv_array *array, int *argc);
+ void argv_array_free_detached(const char **argv);
  
  #endif /* ARGV_ARRAY_H */