fix "builtin-*" references to be "builtin/*"

Documentation and some comments still refer to files in builtin/
as 'builtin-*.[cho]'.  Update these to show the correct location.

Signed-off-by: Phil Hord <hordp@cisco.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Assisted-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 585dac40baabbee291f43a6e7c59c36340286e43..1d119ec72032eeabbf2b5f7efe2fe79fdf816c8a 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -108,9 +108,9 @@ Examples
        in the "release" branch, along with the list of paths
        each commit modifies.
 
        in the "release" branch, along with the list of paths
        each commit modifies.
 

-`git log --follow builtin-rev-list.c`::
+`git log --follow builtin/rev-list.c`::

 
 

-       Shows the commits that changed builtin-rev-list.c, including
+       Shows the commits that changed builtin/rev-list.c, including

        those commits that occurred before the file was given its
        present name.
 
        those commits that occurred before the file was given its
        present name.
 

diff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt
index b0cafe87bee046dc9b2d4e61e0d057e787a6f1f6..790bb28af75be6810a1eee8edee878894f445512 100644 (file)
--- a/Documentation/technical/api-builtin.txt
+++ b/Documentation/technical/api-builtin.txt
@@ -39,7 +39,7 @@ where options is the bitwise-or of:
        on bare repositories.
        This only makes sense when `RUN_SETUP` is also set.
 
        on bare repositories.
        This only makes sense when `RUN_SETUP` is also set.
 

-. Add `builtin-foo.o` to `BUILTIN_OBJS` in `Makefile`.
+. Add `builtin/foo.o` to `BUILTIN_OBJS` in `Makefile`.

 
 Additionally, if `foo` is a new command, there are 3 more things to do:
 
 
 Additionally, if `foo` is a new command, there are 3 more things to do:
 

diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 3062389404e2d4b5f45fa7f5a324e65f933e08b0..ceeace5836130b12ebd544679a39281e6ec37cad 100644 (file)
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -269,10 +269,10 @@ Examples
 --------
 
 See `test-parse-options.c` and
 --------
 
 See `test-parse-options.c` and

-`builtin-add.c`,
-`builtin-clone.c`,
-`builtin-commit.c`,
-`builtin-fetch.c`,
-`builtin-fsck.c`,
-`builtin-rm.c`
+`builtin/add.c`,
+`builtin/clone.c`,
+`builtin/commit.c`,
+`builtin/fetch.c`,
+`builtin/fsck.c`,
+`builtin/rm.c`

 for real-world examples.
 for real-world examples.

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 988c13ff4c8f95f2872d72e399d1fb7d6e6f1413..ac6f3605a96f62dc5615acd303d7ff012e7af8f7 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4254,15 +4254,16 @@ no longer need to call `setup_pager()` directly).
 Nowadays, `git log` is a builtin, which means that it is _contained_ in the
 command `git`.  The source side of a builtin is
 
 Nowadays, `git log` is a builtin, which means that it is _contained_ in the
 command `git`.  The source side of a builtin is
 

-- a function called `cmd_<bla>`, typically defined in `builtin-<bla>.c`,
-  and declared in `builtin.h`,
+- a function called `cmd_<bla>`, typically defined in `builtin/<bla.c>`
+  (note that older versions of Git used to have it in `builtin-<bla>.c`
+  instead), and declared in `builtin.h`.

 
 - an entry in the `commands[]` array in `git.c`, and
 
 - an entry in `BUILTIN_OBJECTS` in the `Makefile`.
 
 Sometimes, more than one builtin is contained in one source file.  For
 
 - an entry in the `commands[]` array in `git.c`, and
 
 - an entry in `BUILTIN_OBJECTS` in the `Makefile`.
 
 Sometimes, more than one builtin is contained in one source file.  For

-example, `cmd_whatchanged()` and `cmd_log()` both reside in `builtin-log.c`,
+example, `cmd_whatchanged()` and `cmd_log()` both reside in `builtin/log.c`,

 since they share quite a bit of code.  In that case, the commands which are
 _not_ named like the `.c` file in which they live have to be listed in
 `BUILT_INS` in the `Makefile`.
 since they share quite a bit of code.  In that case, the commands which are
 _not_ named like the `.c` file in which they live have to be listed in
 `BUILT_INS` in the `Makefile`.


@@ -4285,10 +4286,10 @@ For the sake of clarity, let's stay with `git cat-file`, because it
 - is plumbing, and
 
 - was around even in the initial commit (it literally went only through
 - is plumbing, and
 
 - was around even in the initial commit (it literally went only through

-  some 20 revisions as `cat-file.c`, was renamed to `builtin-cat-file.c`
+  some 20 revisions as `cat-file.c`, was renamed to `builtin/cat-file.c`

   when made a builtin, and then saw less than 10 versions).
 
   when made a builtin, and then saw less than 10 versions).
 

-So, look into `builtin-cat-file.c`, search for `cmd_cat_file()` and look what
+So, look into `builtin/cat-file.c`, search for `cmd_cat_file()` and look what

 it does.
 
 ------------------------------------------------------------------
 it does.
 
 ------------------------------------------------------------------


@@ -4364,7 +4365,7 @@ Another example: Find out what to do in order to make some script a
 builtin:
 
 -------------------------------------------------
 builtin:
 
 -------------------------------------------------

-$ git log --no-merges --diff-filter=A builtin-*.c
+$ git log --no-merges --diff-filter=A builtin/*.c

 -------------------------------------------------
 
 You see, Git is actually the best tool to find out about the source of Git
 -------------------------------------------------
 
 You see, Git is actually the best tool to find out about the source of Git

diff --git a/builtin/help.c b/builtin/help.c
index 6067a6134b58f2464b243f47112226a0a013f5c4..7854f5a8faf23b67ec9660feb3d6b7655c7d4ff0 100644 (file)
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -1,6 +1,4 @@
 /*
 /*

- * builtin-help.c
- *

  * Builtin help command
  */
 #include "cache.h"
  * Builtin help command
  */
 #include "cache.h"

diff --git a/builtin/notes.c b/builtin/notes.c
index 453457adb9dedac510c5a95e0e07cb0b4b46c80e..ac43cbaeeb4daa91f7af712531c79cdd08efa2f6 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2010 Johan Herland <johan@herland.net>
  *
  * Based on git-notes.sh by Johannes Schindelin,
  * Copyright (c) 2010 Johan Herland <johan@herland.net>
  *
  * Based on git-notes.sh by Johannes Schindelin,

- * and builtin-tag.c by Kristian Høgsberg and Carlos Rica.
+ * and builtin/tag.c by Kristian Høgsberg and Carlos Rica.

  */
 
 #include "cache.h"
  */
 
 #include "cache.h"

diff --git a/builtin/replace.c b/builtin/replace.c
index 398ccd5eaa243045c5d21af1e37462846665568a..59d31152d0068dd4a542d2c8e076c629d508500f 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2008 Christian Couder <chriscool@tuxfamily.org>
  *
  *
  * Copyright (c) 2008 Christian Couder <chriscool@tuxfamily.org>
  *

- * Based on builtin-tag.c by Kristian Høgsberg <krh@redhat.com>
+ * Based on builtin/tag.c by Kristian Høgsberg <krh@redhat.com>

  * and Carlos Rica <jasampler@gmail.com> that was itself based on
  * git-tag.sh and mktag.c by Linus Torvalds.
  */
  * and Carlos Rica <jasampler@gmail.com> that was itself based on
  * git-tag.sh and mktag.c by Linus Torvalds.
  */

diff --git a/transport.c b/transport.c
index b9306ef64543d4eb705354ac170d9acc7b735ec5..e3b33520cb82e9cfc9a433e7dbdee24dbbfdf39d 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1153,7 +1153,7 @@ int transport_fetch_refs(struct transport *transport, struct ref *refs)
                 * then local and remote refs are likely to still be equal.
                 * Just feed them all to the fetch method in that case.
                 * This condition shouldn't be met in a non-deepening fetch
                 * then local and remote refs are likely to still be equal.
                 * Just feed them all to the fetch method in that case.
                 * This condition shouldn't be met in a non-deepening fetch

-                * (see builtin-fetch.c:quickfetch()).
+                * (see builtin/fetch.c:quickfetch()).

                 */
                heads = xmalloc(nr_refs * sizeof(*heads));
                for (rm = refs; rm; rm = rm->next)
                 */
                heads = xmalloc(nr_refs * sizeof(*heads));
                for (rm = refs; rm; rm = rm->next)

diff --git a/transport.h b/transport.h
index 4a61c0c3f2d9efa8daf228b20f5d57d96e72e261..3c03b2858f215939827ed48e242b19b7981f438a 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -162,7 +162,7 @@ int transport_connect(struct transport *transport, const char *name,
 int transport_helper_init(struct transport *transport, const char *name);
 int bidirectional_transfer_loop(int input, int output);
 
 int transport_helper_init(struct transport *transport, const char *name);
 int bidirectional_transfer_loop(int input, int output);
 

-/* common methods used by transport.c and builtin-send-pack.c */
+/* common methods used by transport.c and builtin/send-pack.c */

 void transport_verify_remote_names(int nr_heads, const char **heads);
 
 void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose);
 void transport_verify_remote_names(int nr_heads, const char **heads);
 
 void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose);