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>
Phil Hord committed
Jun 18, 2013 at 13:44 UTC
09b7e2204a8e41307192c800162e438ec09ddd2c
9 files changed
+20
-21
Documentation/git-log.txt
+2
-2
@@ -108,9 +108,9 @@ Examples
108
in the "release" branch, along with the list of paths
109
each commit modifies.
110
111
-`git log --follow builtin-rev-list.c`::
111
+`git log --follow builtin/rev-list.c`::
112
113
- Shows the commits that changed builtin-rev-list.c, including
113
+ Shows the commits that changed builtin/rev-list.c, including
114
those commits that occurred before the file was given its
115
present name.
116
Documentation/technical/api-builtin.txt
+1
-1
@@ -39,7 +39,7 @@ where options is the bitwise-or of:
39
on bare repositories.
40
This only makes sense when `RUN_SETUP` is also set.
41
42
-. Add `builtin-foo.o` to `BUILTIN_OBJS` in `Makefile`.
42
+. Add `builtin/foo.o` to `BUILTIN_OBJS` in `Makefile`.
43
44
Additionally, if `foo` is a new command, there are 3 more things to do:
45
Documentation/technical/api-parse-options.txt
+6
-6
@@ -269,10 +269,10 @@ Examples
269
--------
270
271
See `test-parse-options.c` and
272
-`builtin-add.c`,
273
-`builtin-clone.c`,
274
-`builtin-commit.c`,
275
-`builtin-fetch.c`,
276
-`builtin-fsck.c`,
277
-`builtin-rm.c`
272
+`builtin/add.c`,
273
+`builtin/clone.c`,
274
+`builtin/commit.c`,
275
+`builtin/fetch.c`,
276
+`builtin/fsck.c`,
277
+`builtin/rm.c`
278
for real-world examples.
Documentation/user-manual.txt
+7
-6
@@ -4254,15 +4254,16 @@ no longer need to call `setup_pager()` directly).
4254
Nowadays, `git log` is a builtin, which means that it is _contained_ in the
4255
command `git`. The source side of a builtin is
4256
4257
-- a function called `cmd_<bla>`, typically defined in `builtin-<bla>.c`,
4258
- and declared in `builtin.h`,
4257
+- a function called `cmd_<bla>`, typically defined in `builtin/<bla.c>`
4258
+ (note that older versions of Git used to have it in `builtin-<bla>.c`
4259
+ instead), and declared in `builtin.h`.
4260
4261
- an entry in the `commands[]` array in `git.c`, and
4262
4263
- an entry in `BUILTIN_OBJECTS` in the `Makefile`.
4264
4265
Sometimes, more than one builtin is contained in one source file. For
4265
-example, `cmd_whatchanged()` and `cmd_log()` both reside in `builtin-log.c`,
4266
+example, `cmd_whatchanged()` and `cmd_log()` both reside in `builtin/log.c`,
4267
since they share quite a bit of code. In that case, the commands which are
4268
_not_ named like the `.c` file in which they live have to be listed in
4269
`BUILT_INS` in the `Makefile`.
@@ -4285,10 +4286,10 @@ For the sake of clarity, let's stay with `git cat-file`, because it
4286
- is plumbing, and
4287
4288
- was around even in the initial commit (it literally went only through
4288
- some 20 revisions as `cat-file.c`, was renamed to `builtin-cat-file.c`
4289
+ some 20 revisions as `cat-file.c`, was renamed to `builtin/cat-file.c`
4290
when made a builtin, and then saw less than 10 versions).
4291
4291
-So, look into `builtin-cat-file.c`, search for `cmd_cat_file()` and look what
4292
+So, look into `builtin/cat-file.c`, search for `cmd_cat_file()` and look what
4293
it does.
4294
4295
------------------------------------------------------------------
@@ -4364,7 +4365,7 @@ Another example: Find out what to do in order to make some script a
4365
builtin:
4366
4367
-------------------------------------------------
4367
-$ git log --no-merges --diff-filter=A builtin-*.c
4368
+$ git log --no-merges --diff-filter=A builtin/*.c
4369
-------------------------------------------------
4370
4371
You see, Git is actually the best tool to find out about the source of Git
builtin/help.c
-2
@@ -1,6 +1,4 @@
1
/*
2
- * builtin-help.c
3
- *
2
* Builtin help command
3
*/
4
#include "cache.h"
builtin/notes.c
+1
-1
@@ -4,7 +4,7 @@
4
* Copyright (c) 2010 Johan Herland <johan@herland.net>
5
*
6
* Based on git-notes.sh by Johannes Schindelin,
7
- * and builtin-tag.c by Kristian Høgsberg and Carlos Rica.
7
+ * and builtin/tag.c by Kristian Høgsberg and Carlos Rica.
8
*/
9
10
#include "cache.h"
builtin/replace.c
+1
-1
@@ -3,7 +3,7 @@
3
*
4
* Copyright (c) 2008 Christian Couder <chriscool@tuxfamily.org>
5
*
6
- * Based on builtin-tag.c by Kristian Høgsberg <krh@redhat.com>
6
+ * Based on builtin/tag.c by Kristian Høgsberg <krh@redhat.com>
7
* and Carlos Rica <jasampler@gmail.com> that was itself based on
8
* git-tag.sh and mktag.c by Linus Torvalds.
9
*/
transport.c
+1
-1
@@ -1153,7 +1153,7 @@ int transport_fetch_refs(struct transport *transport, struct ref *refs)
1153
* then local and remote refs are likely to still be equal.
1154
* Just feed them all to the fetch method in that case.
1155
* This condition shouldn't be met in a non-deepening fetch
1156
- * (see builtin-fetch.c:quickfetch()).
1156
+ * (see builtin/fetch.c:quickfetch()).
1157
*/
1158
heads = xmalloc(nr_refs * sizeof(*heads));
1159
for (rm = refs; rm; rm = rm->next)
transport.h
+1
-1
@@ -162,7 +162,7 @@ int transport_connect(struct transport *transport, const char *name,
162
int transport_helper_init(struct transport *transport, const char *name);
163
int bidirectional_transfer_loop(int input, int output);
164
165
-/* common methods used by transport.c and builtin-send-pack.c */
165
+/* common methods used by transport.c and builtin/send-pack.c */
166
void transport_verify_remote_names(int nr_heads, const char **heads);
167
168
void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose);