{"thread":{"id":"34199","subject":"[PATCH] fix \"builtin-*\" references to be \"builtin/*\"","startedAt":"2013-06-18T15:59:26Z","lastAt":"2013-06-18T17:06:28Z","messageCount":3,"participants":["Phil Hord","Jonathan Nieder","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"221247","messageId":"1371571166-6481-1-git-send-email-hordp@cisco.com","threadId":"34199","inReplyTo":null,"subject":"[PATCH] fix \"builtin-*\" references to be \"builtin/*\"","fromName":"Phil Hord","fromEmail":"hordp@cisco.com","sentAt":"2013-06-18T15:59:26Z","receivedAt":"2013-06-18T15:59:26Z","isPatch":true,"sender":{"key":"phil.hord@gmail.com","avatar":"https://avatars.githubusercontent.com/u/123908?v=4"},"body":"Documentation and some comments still refer to files in builtin/\nas 'builtin-*.[cho]'. Update these to show the correct location.\n\nSigned-off-by: Phil Hord \n---\n Documentation/git-log.txt | 4 ++--\n Documentation/technical/api-builtin.txt | 2 +-\n Documentation/technical/api-parse-options.txt | 12 ++++++------\n Documentation/user-manual.txt | 10 +++++-----\n builtin/help.c | 2 +-\n builtin/notes.c | 2 +-\n builtin/replace.c | 2 +-\n transport.c | 2 +-\n transport.h | 2 +-\n 9 files changed, 19 insertions(+), 19 deletions(-)\n\ndiff --git a/Documentation/git-log.txt b/Documentation/git-log.txt\nindex 4687fe8..2ea79ba 100644\n--- a/Documentation/git-log.txt\n+++ b/Documentation/git-log.txt\n@@ -128,9 +128,9 @@ Examples\n \tin the \"release\" branch, along with the list of paths\n \teach commit modifies.\n \n-`git log --follow builtin-rev-list.c`::\n+`git log --follow builtin/rev-list.c`::\n \n-\tShows the commits that changed builtin-rev-list.c, including\n+\tShows the commits that changed builtin/rev-list.c, including\n \tthose commits that occurred before the file was given its\n \tpresent name.\n \ndiff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt\nindex 4a4228b..f3c1357 100644\n--- a/Documentation/technical/api-builtin.txt\n+++ b/Documentation/technical/api-builtin.txt\n@@ -39,7 +39,7 @@ where options is the bitwise-or of:\n \ton bare repositories.\n \tThis only makes sense when `RUN_SETUP` is also set.\n \n-. Add `builtin-foo.o` to `BUILTIN_OBJS` in `Makefile`.\n+. Add `builtin/foo.o` to `BUILTIN_OBJS` in `Makefile`.\n \n Additionally, if `foo` is a new command, there are 3 more things to do:\n \ndiff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt\nindex 1317db4..0be2b51 100644\n--- a/Documentation/technical/api-parse-options.txt\n+++ b/Documentation/technical/api-parse-options.txt\n@@ -275,10 +275,10 @@ Examples\n --------\n \n See `test-parse-options.c` and\n-`builtin-add.c`,\n-`builtin-clone.c`,\n-`builtin-commit.c`,\n-`builtin-fetch.c`,\n-`builtin-fsck.c`,\n-`builtin-rm.c`\n+`builtin/add.c`,\n+`builtin/clone.c`,\n+`builtin/commit.c`,\n+`builtin/fetch.c`,\n+`builtin/fsck.c`,\n+`builtin/rm.c`\n for real-world examples.\ndiff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\nindex e831cc2..2483700 100644\n--- a/Documentation/user-manual.txt\n+++ b/Documentation/user-manual.txt\n@@ -4256,7 +4256,7 @@ no longer need to call `setup_pager()` directly).\n Nowadays, `git log` is a builtin, which means that it is _contained_ in the\n command `git`. The source side of a builtin is\n \n-- a function called `cmd_`, typically defined in `builtin-.c`,\n+- a function called `cmd_`, typically defined in `builtin/.c`,\n and declared in `builtin.h`,\n \n - an entry in the `commands[]` array in `git.c`, and\n@@ -4264,7 +4264,7 @@ command `git`. The source side of a builtin is\n - an entry in `BUILTIN_OBJECTS` in the `Makefile`.\n \n Sometimes, more than one builtin is contained in one source file. For\n-example, `cmd_whatchanged()` and `cmd_log()` both reside in `builtin-log.c`,\n+example, `cmd_whatchanged()` and `cmd_log()` both reside in `builtin/log.c`,\n since they share quite a bit of code. In that case, the commands which are\n _not_ named like the `.c` file in which they live have to be listed in\n `BUILT_INS` in the `Makefile`.\n@@ -4287,10 +4287,10 @@ For the sake of clarity, let's stay with `git cat-file`, because it\n - is plumbing, and\n \n - was around even in the initial commit (it literally went only through\n- some 20 revisions as `cat-file.c`, was renamed to `builtin-cat-file.c`\n+ some 20 revisions as `cat-file.c`, was renamed to `builtin/cat-file.c`\n when made a builtin, and then saw less than 10 versions).\n \n-So, look into `builtin-cat-file.c`, search for `cmd_cat_file()` and look what\n+So, look into `builtin/cat-file.c`, search for `cmd_cat_file()` and look what\n it does.\n \n ------------------------------------------------------------------\n@@ -4366,7 +4366,7 @@ Another example: Find out what to do in order to make some script a\n builtin:\n \n -------------------------------------------------\n-$ git log --no-merges --diff-filter=A builtin-*.c\n+$ git log --no-merges --diff-filter=A builtin/*.c\n -------------------------------------------------\n \n You see, Git is actually the best tool to find out about the source of Git\ndiff --git a/builtin/help.c b/builtin/help.c\nindex 062957f..ce7b889 100644\n--- a/builtin/help.c\n+++ b/builtin/help.c\n@@ -1,5 +1,5 @@\n /*\n- * builtin-help.c\n+ * builtin/help.c\n *\n * Builtin help command\n */\ndiff --git a/builtin/notes.c b/builtin/notes.c\nindex 57748a6..d9a67d9 100644\n--- a/builtin/notes.c\n+++ b/builtin/notes.c\n@@ -4,7 +4,7 @@\n * Copyright (c) 2010 Johan Herland \n *\n * Based on git-notes.sh by Johannes Schindelin,\n- * and builtin-tag.c by Kristian Høgsberg and Carlos Rica.\n+ * and builtin/tag.c by Kristian Høgsberg and Carlos Rica.\n */\n \n #include \"cache.h\"\ndiff --git a/builtin/replace.c b/builtin/replace.c\nindex 398ccd5..59d3115 100644\n--- a/builtin/replace.c\n+++ b/builtin/replace.c\n@@ -3,7 +3,7 @@\n *\n * Copyright (c) 2008 Christian Couder \n *\n- * Based on builtin-tag.c by Kristian Høgsberg \n+ * Based on builtin/tag.c by Kristian Høgsberg \n * and Carlos Rica that was itself based on\n * git-tag.sh and mktag.c by Linus Torvalds.\n */\ndiff --git a/transport.c b/transport.c\nindex 359a671..e15db98 100644\n--- a/transport.c\n+++ b/transport.c\n@@ -1232,7 +1232,7 @@ int transport_fetch_refs(struct transport *transport, struct ref *refs)\n \t\t * then local and remote refs are likely to still be equal.\n \t\t * Just feed them all to the fetch method in that case.\n \t\t * This condition shouldn't be met in a non-deepening fetch\n-\t\t * (see builtin-fetch.c:quickfetch()).\n+\t\t * (see builtin/fetch.c:quickfetch()).\n \t\t */\n \t\theads = xmalloc(nr_refs * sizeof(*heads));\n \t\tfor (rm = refs; rm; rm = rm->next)\ndiff --git a/transport.h b/transport.h\nindex 4edebc5..ea70ea7 100644\n--- a/transport.h\n+++ b/transport.h\n@@ -170,7 +170,7 @@ int transport_connect(struct transport *transport, const char *name,\n int transport_helper_init(struct transport *transport, const char *name);\n int bidirectional_transfer_loop(int input, int output);\n \n-/* common methods used by transport.c and builtin-send-pack.c */\n+/* common methods used by transport.c and builtin/send-pack.c */\n void transport_verify_remote_names(int nr_heads, const char **heads);\n \n void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose);\n-- \n1.8.3.1.560.gb7ca476.dirty\n"},{"id":"221252","messageId":"20130618162823.GB2887@elie.Belkin","threadId":"34199","inReplyTo":"1371571166-6481-1-git-send-email-hordp@cisco.com","subject":"Re: [PATCH] fix \"builtin-*\" references to be \"builtin/*\"","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-06-18T16:28:23Z","receivedAt":"2013-06-18T16:28:23Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nPhil Hord wrote:\n\n> Documentation and some comments still refer to files in builtin/\n> as 'builtin-*.[cho]'. Update these to show the correct location.\n\nYeah, good call.\n\n[...]\n> --- a/builtin/help.c\n> +++ b/builtin/help.c\n> @@ -1,5 +1,5 @@\n> /*\n> - * builtin-help.c\n> + * builtin/help.c\n> *\n\nIt would probably be better to remove the above two lines which are\nredundant next to the filename. That can wait for a later patch if\nyou like, though.\n\nWith or without that change,\nReviewed-by: Jonathan Nieder \n"},{"id":"221265","messageId":"7vd2rj5ox7.fsf@alter.siamese.dyndns.org","threadId":"34199","inReplyTo":"1371571166-6481-1-git-send-email-hordp@cisco.com","subject":"Re: [PATCH] fix \"builtin-*\" references to be \"builtin/*\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-18T17:06:28Z","receivedAt":"2013-06-18T17:06:28Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phil Hord writes:\n\n> diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt\n> index e831cc2..2483700 100644\n> --- a/Documentation/user-manual.txt\n> +++ b/Documentation/user-manual.txt\n> @@ -4256,7 +4256,7 @@ no longer need to call `setup_pager()` directly).\n> Nowadays, `git log` is a builtin, which means that it is _contained_ in the\n> command `git`. The source side of a builtin is\n> \n> -- a function called `cmd_`, typically defined in `builtin-.c`,\n> +- a function called `cmd_`, typically defined in `builtin/.c`,\n> and declared in `builtin.h`,\n\nIf we were to do this, we would need to update the \"1.5.3 or newer\"\ncomment at the top of this file to \"1.7.1 or newer\" ;-).\n\nMore seriously, it may be OK to say\n\n\ttypically defined in `builtin/` (note that older\n\tversions of Git used to have it in `builtin-.c`\n\tinstead), and declared in `builtin.h`.\n\nonly here, and then apply your s|builtin-|builtin/| changes to the\nremainder of this file.\n\n> diff --git a/builtin/help.c b/builtin/help.c\n> index 062957f..ce7b889 100644\n> --- a/builtin/help.c\n> +++ b/builtin/help.c\n> @@ -1,5 +1,5 @@\n> /*\n> - * builtin-help.c\n> + * builtin/help.c\n> *\n> * Builtin help command\n> */\n\nAs Jonathan said, dropping this line (and the line after it) would\nbe a sane thing to do.\n\nOther than that, the patch looked good.\n"}]}