Jeff King <peff@xxxxxxxx> writes: > There are no callers which need it anymore. Any topics in flight will > need to be updated as they get merged in (but the compiler will make > that quite clear). > > Signed-off-by: Jeff King <peff@xxxxxxxx> > --- > strvec.h | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/strvec.h b/strvec.h > index 4be39c8a48..bd35de1ce4 100644 > --- a/strvec.h > +++ b/strvec.h > @@ -86,17 +86,4 @@ void strvec_clear(struct strvec *); > */ > const char **strvec_detach(struct strvec *); > > -/* compatibility for historic argv_array interface */ > -#define argv_array strvec > -#define ARGV_ARRAY_INIT STRVEC_INIT > -#define argv_array_init strvec_init > -#define argv_array_push strvec_push > -#define argv_array_pushf strvec_pushf > -#define argv_array_pushl strvec_pushl > -#define argv_array_pushv strvec_pushv > -#define argv_array_pop strvec_pop > -#define argv_array_split strvec_split > -#define argv_array_clear strvec_clear > -#define argv_array_detach strvec_detach > - > #endif /* STRVEC_H */ It was more painful than I would have thought to merge this topic, as we seem to have gained quite a few new calling sites (it shows how popular and useful this API is). Hopefully some of the merge conflict resolutions would be resurrected automatically from the rerere database ;-)