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>
Heikki Orsila committed
Aug 30, 2008 at 14:12 UTC
34baebcee1d66be4cc096a69ba448cd24dcedf21
6 files changed
+11
-11
builtin-apply.c
+1
-1
@@ -274,7 +274,7 @@ static void say_patch_name(FILE *output, const char *pre,
274
static void read_patch_file(struct strbuf *sb, int fd)
275
{
276
if (strbuf_read(sb, fd, 0) < 0)
277
- die("git-apply: read returned %s", strerror(errno));
277
+ die("git apply: read returned %s", strerror(errno));
278
279
/*
280
* Make sure that we have some slop in the buffer
builtin-archive.c
+4
-4
@@ -47,18 +47,18 @@ static int run_remote_archiver(const char *remote, int argc,
47
48
len = packet_read_line(fd[0], buf, sizeof(buf));
49
if (!len)
50
- die("git-archive: expected ACK/NAK, got EOF");
50
+ die("git archive: expected ACK/NAK, got EOF");
51
if (buf[len-1] == '\n')
52
buf[--len] = 0;
53
if (strcmp(buf, "ACK")) {
54
if (len > 5 && !prefixcmp(buf, "NACK "))
55
- die("git-archive: NACK %s", buf + 5);
56
- die("git-archive: protocol error");
55
+ die("git archive: NACK %s", buf + 5);
56
+ die("git archive: protocol error");
57
}
58
59
len = packet_read_line(fd[0], buf, sizeof(buf));
60
if (len)
61
- die("git-archive: expected a flush");
61
+ die("git archive: expected a flush");
62
63
/* Now, start reading from fd[0] and spit it out to stdout */
64
rv = recv_sideband("archive", fd[0], 1, 2);
builtin-blame.c
+1
-1
@@ -1791,7 +1791,7 @@ static int prepare_lines(struct scoreboard *sb)
1791
1792
/*
1793
* Add phony grafts for use with -S; this is primarily to
1794
- * support git-cvsserver that wants to give a linear history
1794
+ * support git's cvsserver that wants to give a linear history
1795
* to its clients.
1796
*/
1797
static int read_ancestry(const char *graft_file)
builtin-bundle.c
+2
-2
@@ -6,10 +6,10 @@
6
* Basic handler for bundle files to connect repositories via sneakernet.
7
* Invocation must include action.
8
* This function can create a bundle or provide information on an existing
9
- * bundle supporting git-fetch, git-pull, and git-ls-remote
9
+ * bundle supporting "fetch", "pull", and "ls-remote".
10
*/
11
12
-static const char *bundle_usage="git-bundle (create <bundle> <git-rev-list args> | verify <bundle> | list-heads <bundle> [refname]... | unbundle <bundle> [refname]... )";
12
+static const char *bundle_usage="git bundle (create <bundle> <git rev-list args> | verify <bundle> | list-heads <bundle> [refname]... | unbundle <bundle> [refname]... )";
13
14
int cmd_bundle(int argc, const char **argv, const char *prefix)
15
{
builtin-cat-file.c
+2
-2
@@ -137,11 +137,11 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
137
break;
138
139
default:
140
- die("git-cat-file: unknown option: %s\n", exp_type);
140
+ die("git cat-file: unknown option: %s\n", exp_type);
141
}
142
143
if (!buf)
144
- die("git-cat-file %s: bad file", obj_name);
144
+ die("git cat-file %s: bad file", obj_name);
145
146
write_or_die(1, buf, size);
147
return 0;
builtin-check-ref-format.c
+1
-1
@@ -9,6 +9,6 @@
9
int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
10
{
11
if (argc != 2)
12
- usage("git-check-ref-format refname");
12
+ usage("git check-ref-format refname");
13
return !!check_ref_format(argv[1]);
14
}