Merge branch 'es/grep-require-name-when-needed' into maint

diff --git a/argv-array.c b/argv-array.c
index cb5bcd2c064961919d965cb2cae79de653162fde..f352ea9357d90e16c7506af9b5b047ac1e2721ac 100644 (file)
--- a/argv-array.c
+++ b/argv-array.c
@@ -21,12 +21,13 @@ static void argv_array_push_nodup(struct argv_array *array, const char *value)
        array->argv[array->argc] = NULL;
 }
 
-void argv_array_push(struct argv_array *array, const char *value)
+const char *argv_array_push(struct argv_array *array, const char *value)
 {
        argv_array_push_nodup(array, xstrdup(value));
+       return array->argv[array->argc - 1];
 }
 
-void argv_array_pushf(struct argv_array *array, const char *fmt, ...)
+const char *argv_array_pushf(struct argv_array *array, const char *fmt, ...)
 {
        va_list ap;
        struct strbuf v = STRBUF_INIT;
@@ -36,6 +37,7 @@ void argv_array_pushf(struct argv_array *array, const char *fmt, ...)
        va_end(ap);
 
        argv_array_push_nodup(array, strbuf_detach(&v, NULL));
+       return array->argv[array->argc - 1];
 }
 
 void argv_array_pushl(struct argv_array *array, ...)