strvec: rename files from argv-array to strvec

This requires updating #include lines across the code-base, but that's
all fairly mechanical, and was done with:

  git ls-files '*.c' '*.h' |
  xargs perl -i -pe 's/argv-array.h/strvec.h/'

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index 372139f1f244824e23684ce95e371d63244de48e..65f8cfb2368d2d6099bdfd845a7beb505702b86f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -828,7 +828,6 @@ LIB_OBJS += apply.o
 LIB_OBJS += archive-tar.o
 LIB_OBJS += archive-zip.o
 LIB_OBJS += archive.o
-LIB_OBJS += argv-array.o
 LIB_OBJS += attr.o
 LIB_OBJS += base85.o
 LIB_OBJS += bisect.o
@@ -986,6 +985,7 @@ LIB_OBJS += sigchain.o
 LIB_OBJS += split-index.o
 LIB_OBJS += stable-qsort.o
 LIB_OBJS += strbuf.o
+LIB_OBJS += strvec.o
 LIB_OBJS += streaming.o
 LIB_OBJS += string-list.o
 LIB_OBJS += sub-process.o

diff --git a/add-patch.c b/add-patch.c
index f899389e2cc2359d255f9a74430ef2a995fba004..09d00c557438e79403956f848fa39fa3d41243b0 100644 (file)
--- a/add-patch.c
+++ b/add-patch.c
@@ -2,7 +2,7 @@
 #include "add-interactive.h"
 #include "strbuf.h"
 #include "run-command.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "pathspec.h"
 #include "color.h"
 #include "diff.h"

diff --git a/bisect.c b/bisect.c
index d5e830410f5949d1e8c24e990cf0a70b980656ea..3160e82e961aee07c2dbf1ed0971b7fb18830421 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -11,7 +11,7 @@
 #include "log-tree.h"
 #include "bisect.h"
 #include "oid-array.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "commit-slab.h"
 #include "commit-reach.h"
 #include "object-store.h"

diff --git a/builtin/add.c b/builtin/add.c
index 298e0114f93166b7e3c1d3c2bc376a34afb7a671..6cd9a4cd77285843b45a20ec8d0a1b9553df3519 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -18,7 +18,7 @@
 #include "diffcore.h"
 #include "revision.h"
 #include "bulk-checkin.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "submodule.h"
 #include "add-interactive.h"
 

diff --git a/builtin/annotate.c b/builtin/annotate.c
index da413ae0d178b53d6b1e6c193577c23923255245..43534487120f05fca1c1f59de76dc13613a451ca 100644 (file)
--- a/builtin/annotate.c
+++ b/builtin/annotate.c
@@ -5,7 +5,7 @@
  */
 #include "git-compat-util.h"
 #include "builtin.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 int cmd_annotate(int argc, const char **argv, const char *prefix)
 {

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index ec4996282e36e2edcd4109321f83b921a24c5a32..e929315b3817dc8bcc16175b6e5bc1ced73780d6 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -4,7 +4,7 @@
 #include "bisect.h"
 #include "refs.h"
 #include "dir.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "run-command.h"
 #include "prompt.h"
 #include "quote.h"

diff --git a/builtin/bundle.c b/builtin/bundle.c
index f049d27a14405d540902ba5d368a59d670f7f614..51fc6d9739df108302e74f64d49c9101f4ee13c8 100644 (file)
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -1,5 +1,5 @@
 #include "builtin.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "parse-options.h"
 #include "cache.h"
 #include "bundle.h"

diff --git a/builtin/describe.c b/builtin/describe.c
index 21d2cb9e57f4bf5c33f47989128710411c431d5d..32ad6822f7dee42f50a60890247adb3f5989ec96 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -12,7 +12,7 @@
 #include "revision.h"
 #include "diff.h"
 #include "hashmap.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "run-command.h"
 #include "object-store.h"
 #include "list-objects.h"

diff --git a/builtin/difftool.c b/builtin/difftool.c
index c280e682b2aec8ba8d136576d2c3039b1d62b985..c0608a78d9cb47ee21369b27d5c2c61f4067bf25 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -18,7 +18,7 @@
 #include "run-command.h"
 #include "exec-cmd.h"
 #include "parse-options.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "strbuf.h"
 #include "lockfile.h"
 #include "object-store.h"

diff --git a/builtin/fetch.c b/builtin/fetch.c
index 82ac4be8a5200c7f6ac89c07cb486ac74f548ea3..b183b55ee91be1b57d9f9a8d79f5b8b344ad081f 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -19,7 +19,7 @@
 #include "submodule-config.h"
 #include "submodule.h"
 #include "connected.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "utf8.h"
 #include "packfile.h"
 #include "list-objects-filter-options.h"

diff --git a/builtin/gc.c b/builtin/gc.c
index 8e0b9cf41b3d3f43c7e13677468ca7099ea3fe9f..27951ee0617bf86e52a33a98ae1fe40d91227abd 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -18,7 +18,7 @@
 #include "parse-options.h"
 #include "run-command.h"
 #include "sigchain.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "commit.h"
 #include "commit-graph.h"
 #include "packfile.h"

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 7016b28485b43f9df360f4f6df23cb7e0e3881dd..5f18f0ee9d4123adb74f0cb1f2c97ce17a5ef072 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -27,7 +27,7 @@
 #include "delta-islands.h"
 #include "reachable.h"
 #include "oid-array.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "list.h"
 #include "packfile.h"
 #include "object-store.h"

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 37ba76ac3d26f86ef3c16b65d2293b873efd8ee5..38145a66ed586fa45af9750a3bc5b138bf9697e6 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -8,7 +8,7 @@
 #include "builtin.h"
 #include "run-command.h"
 #include "exec-cmd.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "dir.h"
 #include "packfile.h"
 #include "refs.h"

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index d43663bb0a9e8f410371ac06a34794060101578f..128563148177a836b0304526fc087e736000c179 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -15,7 +15,7 @@
 #include "string-list.h"
 #include "oid-array.h"
 #include "connected.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "version.h"
 #include "tag.h"
 #include "gpg-interface.h"

diff --git a/builtin/remote.c b/builtin/remote.c
index e8377994e57a2286f9cea329578c8f104a392b88..a9f35ba855c74926ee839fb0ca8d802bc19d95d6 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -10,7 +10,7 @@
 #include "refs.h"
 #include "refspec.h"
 #include "object-store.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "commit-reach.h"
 
 static const char * const builtin_remote_usage[] = {

diff --git a/builtin/repack.c b/builtin/repack.c
index df287739d9081cbccb203ca3f8cc744490e949ca..8bccb38a2895e7da7d34ffefe83a820b4089062d 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -7,7 +7,7 @@
 #include "sigchain.h"
 #include "strbuf.h"
 #include "string-list.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "midx.h"
 #include "packfile.h"
 #include "prune-packed.h"

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 7e52ee91264a63713da5178add167f8d62c36877..f0a70538c3788fe7e08c59d96392e44355a45aeb 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -4,7 +4,7 @@
 #include "refs.h"
 #include "builtin.h"
 #include "color.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "parse-options.h"
 #include "dir.h"
 #include "commit-slab.h"

diff --git a/builtin/stash.c b/builtin/stash.c
index 0c52a3b849c4c6f811995f3be89284052c2dd313..1acf2162549430cc0795d799999b6cc4e865e243 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -7,7 +7,7 @@
 #include "cache-tree.h"
 #include "unpack-trees.h"
 #include "merge-recursive.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "run-command.h"
 #include "dir.h"
 #include "rerere.h"

diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index b74dd9a69d992bcbac678f5b463a5e00b5299140..8a2df4459c66389d0fc24fed93dc4e0c1f87efe1 100644 (file)
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -4,7 +4,7 @@
 #include "builtin.h"
 #include "parse-options.h"
 #include "quote.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 static const char * const git_update_ref_usage[] = {
        N_("git update-ref [<options>] -d <refname> [<old-val>]"),

diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index 018879737aeedc245a1473247df16ed0dcd26e50..7fc8e0e82d32d3ba33cc33f22378d04c49aa9c47 100644 (file)
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -7,7 +7,7 @@
 #include "pkt-line.h"
 #include "sideband.h"
 #include "run-command.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 static const char upload_archive_usage[] =
        "git upload-archive <repo>";

diff --git a/builtin/worktree.c b/builtin/worktree.c
index f0cbdef718215d1ff71a2a71204c10d296a9b2c8..35945096f6b26094a3b0a2f5d3e2dc3412cce67f 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -4,7 +4,7 @@
 #include "builtin.h"
 #include "dir.h"
 #include "parse-options.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "branch.h"
 #include "refs.h"
 #include "run-command.h"

diff --git a/bundle.c b/bundle.c
index 2a0d744d3fa51b2bbbb307a04f7e32a45b1b690d..d46a387e66596a8f825a797d5c05395996cdfc62 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -10,7 +10,7 @@
 #include "list-objects.h"
 #include "run-command.h"
 #include "refs.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 static const char bundle_signature[] = "# v2 git bundle\n";
 

diff --git a/bundle.h b/bundle.h
index 2dc9442024fa27f775e25bbfa9dc8ba04ca1967c..2cf12700929b7b69f95483eb2a9865fd146cec82 100644 (file)
--- a/bundle.h
+++ b/bundle.h
@@ -1,7 +1,7 @@
 #ifndef BUNDLE_H
 #define BUNDLE_H
 
-#include "argv-array.h"
+#include "strvec.h"
 #include "cache.h"
 
 struct ref_list {

diff --git a/diff.c b/diff.c
index d24aaa304780b7105618434d80a76627e588d280..ee008155e4ed693f6f58485392e15db53099d711 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -20,7 +20,7 @@
 #include "hashmap.h"
 #include "ll-merge.h"
 #include "string-list.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "graph.h"
 #include "packfile.h"
 #include "parse-options.h"

diff --git a/environment.c b/environment.c
index aaca0e91ac8f4a3043dfbe963b33a376e72020fd..75fe5f4c5606dfe5dbacf716520183aefb4aaea3 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -14,7 +14,7 @@
 #include "refs.h"
 #include "fmt-merge-msg.h"
 #include "commit.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "object-store.h"
 #include "chdir-notify.h"
 #include "shallow.h"

diff --git a/exec-cmd.c b/exec-cmd.c
index 7deeab30397cf2edbee622717acd94de87256c8e..bb24c2f3bc6ed31bd04faf4a5e3988ad75a93f00 100644 (file)
--- a/exec-cmd.c
+++ b/exec-cmd.c
@@ -1,7 +1,7 @@
 #include "cache.h"
 #include "exec-cmd.h"
 #include "quote.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 #if defined(RUNTIME_PREFIX)
 

diff --git a/graph.c b/graph.c
index 4cd9915075ff23d8a5218609b06239b9d9f08435..96af8f605a65dc7867af5afc3f153fac99a121a5 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -4,7 +4,7 @@
 #include "color.h"
 #include "graph.h"
 #include "revision.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 /* Internal API */
 

diff --git a/http-backend.c b/http-backend.c
index ec3144b4447548cfd9cf23d22c1f7f5f8c7cde35..6a42badf33359e966f0af34a4dfd40b7ef5201bd 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -9,7 +9,7 @@
 #include "run-command.h"
 #include "string-list.h"
 #include "url.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "packfile.h"
 #include "object-store.h"
 #include "protocol.h"

diff --git a/http-push.c b/http-push.c
index 1ff1883cdd9fdb537d52b1c2c25f780378de5e7c..3a47921cc318b9340980b204781258837595ff38 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -11,7 +11,7 @@
 #include "remote.h"
 #include "list-objects.h"
 #include "sigchain.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "packfile.h"
 #include "object-store.h"
 #include "commit-reach.h"

diff --git a/line-log.c b/line-log.c
index c53692834d858cb602431f6a15c30203615e3b0a..05d077b8e7c77c637e6d3498b953f12c08e1d1d7 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -14,7 +14,7 @@
 #include "graph.h"
 #include "userdiff.h"
 #include "line-log.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "bloom.h"
 
 static void range_set_grow(struct range_set *rs, size_t extra)

diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
index 3553ad7b0a759e13258a267960caf2ee15b6f019..3667766f292c4a38154eb62aca393ca81303971d 100644 (file)
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@ -2,7 +2,7 @@
 #include "commit.h"
 #include "config.h"
 #include "revision.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "list-objects.h"
 #include "list-objects-filter.h"
 #include "list-objects-filter-options.h"

diff --git a/ls-refs.c b/ls-refs.c
index 50d86866c6eac5957951e5b685d7912fcf12eed7..98fb19092a1c8ece77d118842be637455232de99 100644 (file)
--- a/ls-refs.c
+++ b/ls-refs.c
@@ -2,7 +2,7 @@
 #include "repository.h"
 #include "refs.h"
 #include "remote.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "ls-refs.h"
 #include "pkt-line.h"
 #include "config.h"

diff --git a/parse-options-cb.c b/parse-options-cb.c
index 86cd3930136e269ca68759b0113875e0a8e80e8a..7cba96454ce47f32be23304739e3a1f1b38ab43e 100644 (file)
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -4,7 +4,7 @@
 #include "commit.h"
 #include "color.h"
 #include "string-list.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "oid-array.h"
 
 /*----- some often used options -----*/

diff --git a/pathspec.c b/pathspec.c
index 8243e06eab48373d12729959fde8fe666eb312b2..57c9b58418fe2efceba56c926a07b99e6139a2ab 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -3,7 +3,7 @@
 #include "dir.h"
 #include "pathspec.h"
 #include "attr.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "quote.h"
 
 /*

diff --git a/quote.c b/quote.c
index bcc0dbc50d9b98bb5317398505d6548c98005c2f..dac8b4e55eaa49a8b5afb3e623f4d021fbc532b9 100644 (file)
--- a/quote.c
+++ b/quote.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 #include "quote.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 int quote_path_fully = 1;
 

diff --git a/range-diff.c b/range-diff.c
index 40af0862818c15d6c432da1d02fbe1ba7cadf230..b4d1d56445bd79c1ee91bf8ebf50537ed48156a8 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -2,7 +2,7 @@
 #include "range-diff.h"
 #include "string-list.h"
 #include "run-command.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "hashmap.h"
 #include "xdiff-interface.h"
 #include "linear-assignment.h"

diff --git a/range-diff.h b/range-diff.h
index e11976dc81baf21542e39eb113adf1fe9e37e9c2..916f18bcd755b1064ce7d492ff7d7d322bb31163 100644 (file)
--- a/range-diff.h
+++ b/range-diff.h
@@ -2,7 +2,7 @@
 #define RANGE_DIFF_H
 
 #include "diff.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
 

diff --git a/ref-filter.c b/ref-filter.c
index 8447cb09be0c2741b5a20426e6c0db104339fa7e..81c4399da9e81468e0fea9ce80bcde95ecb73b8c 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -22,7 +22,7 @@
 #include "commit-reach.h"
 #include "worktree.h"
 #include "hashmap.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 static struct ref_msg {
        const char *gone;

diff --git a/refs.c b/refs.c
index 639cba93b4e0a78697a55995c926adc3e05d5126..00679262625f273c18b9444281e1b607598e063d 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -15,7 +15,7 @@
 #include "tag.h"
 #include "submodule.h"
 #include "worktree.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "repository.h"
 #include "sigchain.h"
 

diff --git a/refspec.c b/refspec.c
index 9a9bf21934afb74e34b8cef1042860824f4c7282..f9fb67d2956c97473d633e0d992f138708496695 100644 (file)
--- a/refspec.c
+++ b/refspec.c
@@ -1,5 +1,5 @@
 #include "cache.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "refs.h"
 #include "refspec.h"
 

diff --git a/remote-curl.c b/remote-curl.c
index 5cbc6e50025b7cbf8b210cdd7bd6638fe2fa57fa..05fb794dddd9d52e0138cad17f763a9898401413 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -10,7 +10,7 @@
 #include "pkt-line.h"
 #include "string-list.h"
 #include "sideband.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "credential.h"
 #include "oid-array.h"
 #include "send-pack.h"

diff --git a/remote-testsvn.c b/remote-testsvn.c
index cde39b94fb8439a9da3c57428a7f5e15056ae54a..809b290d45a8e2ec11d1821ae9c81fe2fd74e327 100644 (file)
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -8,7 +8,7 @@
 #include "run-command.h"
 #include "vcs-svn/svndump.h"
 #include "notes.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 static const char *url;
 static int dump_from_file;

diff --git a/remote.c b/remote.c
index bc46413e6a75788da66b5c0c6bec9aa5a52c5403..ba1a386d98f9cd1bdc15254bb57219ab5a8b7849 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -11,7 +11,7 @@
 #include "tag.h"
 #include "string-list.h"
 #include "mergesort.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "commit-reach.h"
 #include "advice.h"
 

diff --git a/revision.c b/revision.c
index 6aa7f4f56755bdc2b79455c61a9882085980f90a..07e16ed44ba46e588129c39c9e4c24b443805799 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -23,7 +23,7 @@
 #include "bisect.h"
 #include "packfile.h"
 #include "worktree.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "commit-reach.h"
 #include "commit-graph.h"
 #include "prio-queue.h"

diff --git a/run-command.c b/run-command.c
index a735e380a9c2bb8e461e1182ab3103cbd5cc960b..8f57661d96f24fb507fb09151d60bc79b3f41031 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -2,7 +2,7 @@
 #include "run-command.h"
 #include "exec-cmd.h"
 #include "sigchain.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "thread-utils.h"
 #include "strbuf.h"
 #include "string-list.h"

diff --git a/run-command.h b/run-command.h
index ef3071a56560a53aac8072dcd001113e28c65877..f5e05d38d2178d6e843476eb91a358fd2e87dcc5 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -3,7 +3,7 @@
 
 #include "thread-utils.h"
 
-#include "argv-array.h"
+#include "strvec.h"
 
 /**
  * The run-command API offers a versatile tool to run sub-processes with

diff --git a/sequencer.c b/sequencer.c
index fd7701c88a8643c424d4f61fd0cc86fde3097d7d..9e7f868b00542072cf47f8e9dcade1f86dd48e1e 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -16,7 +16,7 @@
 #include "rerere.h"
 #include "merge-recursive.h"
 #include "refs.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "quote.h"
 #include "trailer.h"
 #include "log-tree.h"

diff --git a/serve.c b/serve.c
index fbd2fcdfb52f7151e53bed7fdc182305bc015df2..8d9a345b3db93a31fac744b7e693f0e7e73b9cf9 100644 (file)
--- a/serve.c
+++ b/serve.c
@@ -3,7 +3,7 @@
 #include "config.h"
 #include "pkt-line.h"
 #include "version.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "ls-refs.h"
 #include "serve.h"
 #include "upload-pack.h"

diff --git a/argv-array.c b/strvec.c
similarity index 98%
rename from argv-array.c
rename to strvec.c
index b7461c47e454d7be9887ad35f8f5601a2e47e195..9e76ab9295b743d6273be3a94eed9b264f27a4c0 100644 (file)
--- a/argv-array.c
+++ b/strvec.c
@@ -1,5 +1,5 @@
 #include "cache.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "strbuf.h"
 
 const char *empty_strvec[] = { NULL };

diff --git a/argv-array.h b/strvec.h
similarity index 97%
rename from argv-array.h
rename to strvec.h
index ca66a338ada7df8f91b116b6666ec6510a7e4516..4be39c8a4876ab24c3855d909daeeb2a20c15936 100644 (file)
--- a/argv-array.h
+++ b/strvec.h
@@ -1,5 +1,5 @@
-#ifndef ARGV_ARRAY_H
-#define ARGV_ARRAY_H
+#ifndef STRVEC_H
+#define STRVEC_H
 
 /**
  * The argv-array API allows one to dynamically build and store
@@ -99,4 +99,4 @@ const char **strvec_detach(struct strvec *);
 #define argv_array_clear strvec_clear
 #define argv_array_detach strvec_detach
 
-#endif /* ARGV_ARRAY_H */
+#endif /* STRVEC_H */

diff --git a/submodule.c b/submodule.c
index e2ef5698c893c3587e500ac88b46aa9ba68609ea..874db5c4b248b82df16f636af539ea704049ae90 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -13,7 +13,7 @@
 #include "refs.h"
 #include "string-list.h"
 #include "oid-array.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "blob.h"
 #include "thread-utils.h"
 #include "quote.h"

diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 1646aa25d82f9e705d8d4b097e95fec768337e70..8d3f6d5a5ed2d3935fed85b102f1dfda0eaf06bb 100644 (file)
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -12,7 +12,7 @@
 #include "git-compat-util.h"
 #include "cache.h"
 #include "run-command.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "strbuf.h"
 #include "parse-options.h"
 #include "string-list.h"

diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c
index 197819c872eec78c7c12ad56f8b8d9ff36f161d7..823f33ceff4aadac07128786f01c8a38a223cdcf 100644 (file)
--- a/t/helper/test-trace2.c
+++ b/t/helper/test-trace2.c
@@ -1,6 +1,6 @@
 #include "test-tool.h"
 #include "cache.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "run-command.h"
 #include "exec-cmd.h"
 #include "config.h"

diff --git a/tmp-objdir.c b/tmp-objdir.c
index 91c00567f4d63367d6766808b0ff90f6faa08765..06924a78758f15a63850e4e47031a9ce4bf35b65 100644 (file)
--- a/tmp-objdir.c
+++ b/tmp-objdir.c
@@ -4,7 +4,7 @@
 #include "sigchain.h"
 #include "string-list.h"
 #include "strbuf.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "quote.h"
 #include "object-store.h"
 

diff --git a/transport-helper.c b/transport-helper.c
index c6b753bfae4bd4e19fd7e3ea16b9f82a8219f10f..441763fd7cd7552a1f6fbeeb883a542d9b50cc5a 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -9,7 +9,7 @@
 #include "string-list.h"
 #include "thread-utils.h"
 #include "sigchain.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "refs.h"
 #include "refspec.h"
 #include "transport-internal.h"

diff --git a/unpack-trees.c b/unpack-trees.c
index 4be5fc3075410f4004b9d5fc1902eb84880dded5..65c3395f0fb07adfca0cc6c28ac1af55fd5c3bea 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1,5 +1,5 @@
 #include "cache.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "repository.h"
 #include "config.h"
 #include "dir.h"

diff --git a/unpack-trees.h b/unpack-trees.h
index 9c2f08277ee1ac4ba7e16e51c2c2d53c9ff14485..f8a904a05b76b1d5ba7a10faa73a55b723a61348 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -2,7 +2,7 @@
 #define UNPACK_TREES_H
 
 #include "cache.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "string-list.h"
 #include "tree-walk.h"
 

diff --git a/upload-pack.c b/upload-pack.c
index 951a2b23aaf8f03d08f8976557de8616bbb2b5ca..b435dae62f626737bd563a6f4f3048a783a3950e 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -18,7 +18,7 @@
 #include "sigchain.h"
 #include "version.h"
 #include "string-list.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "prio-queue.h"
 #include "protocol.h"
 #include "quote.h"

diff --git a/wt-status.c b/wt-status.c
index c560cbe860a42daa136e16195535ef10e2ab0a9f..9817161da4575c629ab5fb2ec51a34139d8b0d48 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -8,7 +8,7 @@
 #include "diffcore.h"
 #include "quote.h"
 #include "run-command.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "remote.h"
 #include "refs.h"
 #include "submodule.h"