diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 12:51:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 12:51:29 (GMT) |
| commit | e47dbece39712567a36a096010c5c1223119f7e3 (patch) | |
| tree | aced74e797a0c37931e367574bdd60cbfb63e0f4 /argv-array.h | |
| parent | 9472b13201aea57d7f9212ca2678aba4d6dbdfdb (diff) | |
| parent | 1c41d2805e42d77d943fd3d79ebf5136f74c9ba3 (diff) | |
| download | git-e47dbece39712567a36a096010c5c1223119f7e3.zip git-e47dbece39712567a36a096010c5c1223119f7e3.tar.gz git-e47dbece39712567a36a096010c5c1223119f7e3.tar.bz2 | |
Merge branch 'ma/unpack-trees-free-msgs'
Leak plugging.
* ma/unpack-trees-free-msgs:
unpack_trees_options: free messages when done
argv-array: return the pushed string from argv_push*()
merge-recursive: provide pair of `unpack_trees_{start,finish}()`
merge: setup `opts` later in `checkout_fast_forward()`
Diffstat (limited to 'argv-array.h')
| -rw-r--r-- | argv-array.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/argv-array.h b/argv-array.h index 750c30d..a39ba43 100644 --- a/argv-array.h +++ b/argv-array.h @@ -12,9 +12,9 @@ struct argv_array { #define ARGV_ARRAY_INIT { empty_argv, 0, 0 } void argv_array_init(struct argv_array *); -void argv_array_push(struct argv_array *, const char *); +const char *argv_array_push(struct argv_array *, const char *); __attribute__((format (printf,2,3))) -void argv_array_pushf(struct argv_array *, const char *fmt, ...); +const char *argv_array_pushf(struct argv_array *, const char *fmt, ...); LAST_ARG_MUST_BE_NULL void argv_array_pushl(struct argv_array *, ...); void argv_array_pushv(struct argv_array *, const char **); |