Start conforming code to "git subcmd" style

User notifications are presented as 'git cmd', and code comments
are presented as '"cmd"' or 'git's cmd', rather than 'git-cmd'.

Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-apply.c b/builtin-apply.c
index 2216a0bf7cd53adc31346f66a3b9786a1d688bad..40eeabb625a405e38f03d8cecb79b927d69d8bf9 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -274,7 +274,7 @@ static void say_patch_name(FILE *output, const char *pre,
 static void read_patch_file(struct strbuf *sb, int fd)
 {
        if (strbuf_read(sb, fd, 0) < 0)
 static void read_patch_file(struct strbuf *sb, int fd)
 {
        if (strbuf_read(sb, fd, 0) < 0)

-               die("git-apply: read returned %s", strerror(errno));
+               die("git apply: read returned %s", strerror(errno));

 
        /*
         * Make sure that we have some slop in the buffer
 
        /*
         * Make sure that we have some slop in the buffer

diff --git a/builtin-archive.c b/builtin-archive.c
index 22445acbfc5279f391ac6afa855b21064ec54535..5ceec433fd590e8bf6a51700ea69c37f9af30fa7 100644 (file)
--- a/builtin-archive.c
+++ b/builtin-archive.c
@@ -47,18 +47,18 @@ static int run_remote_archiver(const char *remote, int argc,
 
        len = packet_read_line(fd[0], buf, sizeof(buf));
        if (!len)
 
        len = packet_read_line(fd[0], buf, sizeof(buf));
        if (!len)

-               die("git-archive: expected ACK/NAK, got EOF");
+               die("git archive: expected ACK/NAK, got EOF");

        if (buf[len-1] == '\n')
                buf[--len] = 0;
        if (strcmp(buf, "ACK")) {
                if (len > 5 && !prefixcmp(buf, "NACK "))
        if (buf[len-1] == '\n')
                buf[--len] = 0;
        if (strcmp(buf, "ACK")) {
                if (len > 5 && !prefixcmp(buf, "NACK "))

-                       die("git-archive: NACK %s", buf + 5);
-               die("git-archive: protocol error");
+                       die("git archive: NACK %s", buf + 5);
+               die("git archive: protocol error");

        }
 
        len = packet_read_line(fd[0], buf, sizeof(buf));
        if (len)
        }
 
        len = packet_read_line(fd[0], buf, sizeof(buf));
        if (len)

-               die("git-archive: expected a flush");
+               die("git archive: expected a flush");

 
        /* Now, start reading from fd[0] and spit it out to stdout */
        rv = recv_sideband("archive", fd[0], 1, 2);
 
        /* Now, start reading from fd[0] and spit it out to stdout */
        rv = recv_sideband("archive", fd[0], 1, 2);

diff --git a/builtin-blame.c b/builtin-blame.c
index 4ea343189fdad035318e94ce0c6c2ec16b62ba7f..d2fc68c68a02d87c1f61442f8bbbc66c07b5b8d0 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -1791,7 +1791,7 @@ static int prepare_lines(struct scoreboard *sb)
 
 /*
  * Add phony grafts for use with -S; this is primarily to
 
 /*
  * Add phony grafts for use with -S; this is primarily to

- * support git-cvsserver that wants to give a linear history
+ * support git's cvsserver that wants to give a linear history

  * to its clients.
  */
 static int read_ancestry(const char *graft_file)
  * to its clients.
  */
 static int read_ancestry(const char *graft_file)

diff --git a/builtin-bundle.c b/builtin-bundle.c
index ac476e7a4b45fc55b6b6d1e4d02be0c35aba2c7b..9b58152047baebfdd6f26ffab31d49347e0cb069 100644 (file)
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -6,10 +6,10 @@
  * Basic handler for bundle files to connect repositories via sneakernet.
  * Invocation must include action.
  * This function can create a bundle or provide information on an existing
  * Basic handler for bundle files to connect repositories via sneakernet.
  * Invocation must include action.
  * This function can create a bundle or provide information on an existing

- * bundle supporting git-fetch, git-pull, and git-ls-remote
+ * bundle supporting "fetch", "pull", and "ls-remote".

  */
 
  */
 

-static const char *bundle_usage="git-bundle (create <bundle> <git-rev-list args> | verify <bundle> | list-heads <bundle> [refname]... | unbundle <bundle> [refname]... )";
+static const char *bundle_usage="git bundle (create <bundle> <git rev-list args> | verify <bundle> | list-heads <bundle> [refname]... | unbundle <bundle> [refname]... )";

 
 int cmd_bundle(int argc, const char **argv, const char *prefix)
 {
 
 int cmd_bundle(int argc, const char **argv, const char *prefix)
 {

diff --git a/builtin-cat-file.c b/builtin-cat-file.c
index 7441a56acdbefdd8044a406f4d756ce8a4f06644..3fba6b9e743545868368a0e554466fca3814316a 100644 (file)
--- a/builtin-cat-file.c
+++ b/builtin-cat-file.c
@@ -137,11 +137,11 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
                break;
 
        default:
                break;
 
        default:

-               die("git-cat-file: unknown option: %s\n", exp_type);
+               die("git cat-file: unknown option: %s\n", exp_type);

        }
 
        if (!buf)
        }
 
        if (!buf)

-               die("git-cat-file %s: bad file", obj_name);
+               die("git cat-file %s: bad file", obj_name);

 
        write_or_die(1, buf, size);
        return 0;
 
        write_or_die(1, buf, size);
        return 0;

diff --git a/builtin-check-ref-format.c b/builtin-check-ref-format.c
index fe04be77a9312c11fa054897c5982fa6c74b8e5e..701de439ae0f508f3a8ab41559230357be60637e 100644 (file)
--- a/builtin-check-ref-format.c
+++ b/builtin-check-ref-format.c
@@ -9,6 +9,6 @@
 int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
 {
        if (argc != 2)
 int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
 {
        if (argc != 2)

-               usage("git-check-ref-format refname");
+               usage("git check-ref-format refname");

        return !!check_ref_format(argv[1]);
 }
        return !!check_ref_format(argv[1]);
 }