All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sebastian Schuberth <sschuberth@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
	Christian Couder <christian.couder@gmail.com>
Subject: [PATCH v2 1/4] Consistently use the term "builtin" instead of "internal command"
Date: Thu, 02 Jan 2014 17:15:44 +0100	[thread overview]
Message-ID: <52C590B0.1020702@gmail.com> (raw)
In-Reply-To: <52C58FD7.6010608@gmail.com>


Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
---
 Documentation/technical/api-builtin.txt |  2 +-
 git.c                                   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt
index f3c1357..150a02a 100644
--- a/Documentation/technical/api-builtin.txt
+++ b/Documentation/technical/api-builtin.txt
@@ -14,7 +14,7 @@ Git:
 
 . Add the external declaration for the function to `builtin.h`.
 
-. Add the command to `commands[]` table in `handle_internal_command()`,
+. Add the command to `commands[]` table in `handle_builtin()`,
   defined in `git.c`.  The entry should look like:
 
 	{ "foo", cmd_foo, <options> },
diff --git a/git.c b/git.c
index 3799514..89ab5d7 100644
--- a/git.c
+++ b/git.c
@@ -332,7 +332,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 	return 0;
 }
 
-static void handle_internal_command(int argc, const char **argv)
+static void handle_builtin(int argc, const char **argv)
 {
 	const char *cmd = argv[0];
 	static struct cmd_struct commands[] = {
@@ -517,8 +517,8 @@ static int run_argv(int *argcp, const char ***argv)
 	int done_alias = 0;
 
 	while (1) {
-		/* See if it's an internal command */
-		handle_internal_command(*argcp, *argv);
+		/* See if it's a builtin */
+		handle_builtin(*argcp, *argv);
 
 		/* .. then try the external ones */
 		execv_dashed_external(*argv);
@@ -563,14 +563,14 @@ int main(int argc, char **av)
 	 *  - cannot execute it externally (since it would just do
 	 *    the same thing over again)
 	 *
-	 * So we just directly call the internal command handler, and
-	 * die if that one cannot handle it.
+	 * So we just directly call the builtin handler, and die if
+	 * that one cannot handle it.
 	 */
 	if (starts_with(cmd, "git-")) {
 		cmd += 4;
 		argv[0] = cmd;
-		handle_internal_command(argc, argv);
-		die("cannot handle %s internally", cmd);
+		handle_builtin(argc, argv);
+		die("cannot handle %s as a builtin", cmd);
 	}
 
 	/* Look for flags.. */
-- 
1.8.3-mingw-1

  reply	other threads:[~2014-01-02 16:15 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-02 16:12 [PATCH v2 0/4] Sebastian Schuberth
2014-01-02 16:15 ` Sebastian Schuberth [this message]
2014-01-02 20:31   ` [PATCH v2 1/4] Consistently use the term "builtin" instead of "internal command" Jonathan Nieder
2014-01-02 21:05     ` Sebastian Schuberth
2014-01-22 21:08       ` Sebastian Schuberth
2014-01-02 16:16 ` [PATCH v2 2/4] Call load_command_list() only when it is needed Sebastian Schuberth
2014-01-02 16:17 ` [PATCH v2 3/4] Speed up is_git_command() by checking early for internal commands Sebastian Schuberth
2014-01-02 19:41   ` Junio C Hamano
2014-01-03 15:44     ` Jeff King
2014-01-03 18:00       ` Junio C Hamano
2014-01-03 16:49   ` Kent R. Spillner
2014-01-05 13:42     ` Sebastian Schuberth
2014-01-22 21:05       ` Sebastian Schuberth
2014-01-02 16:17 ` [PATCH v2 4/4] Move builtin-related implementations to a new builtin.c file Sebastian Schuberth
2014-01-02 19:43   ` Junio C Hamano
2014-01-02 20:58     ` Sebastian Schuberth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=52C590B0.1020702@gmail.com \
    --to=sschuberth@gmail.com \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.