Skip to content

Commit 36f44a0

Browse files
gitstergitster
committed
Merge branch 'ho/dashless' into maint
* ho/dashless: tests: use "git xyzzy" form (t7200 - t9001) tests: use "git xyzzy" form (t7000 - t7199) tests: use "git xyzzy" form (t3600 - t6999) tests: use "git xyzzy" form (t0000 - t3599) 'git foo' program identifies itself without dash in die() messages Start conforming code to "git subcmd" style
2 parents 73bae1d + 47a528a commit 36f44a0

File tree

96 files changed

+578
-578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+578
-578
lines changed

‎builtin-apply.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ static void say_patch_name(FILE *output, const char *pre,
274274
static void read_patch_file(struct strbuf *sb, int fd)
275275
{
276276
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));
278278

279279
/*
280280
* Make sure that we have some slop in the buffer
@@ -506,17 +506,17 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,
506506
name = orig_name;
507507
len = strlen(name);
508508
if (isnull)
509-
die("git-apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
509+
die("git apply: bad git-diff - expected /dev/null, got %s on line %d", name, linenr);
510510
another = find_name(line, NULL, p_value, TERM_TAB);
511511
if (!another || memcmp(another, name, len))
512-
die("git-apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
512+
die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
513513
free(another);
514514
return orig_name;
515515
}
516516
else {
517517
/* expect "/dev/null" */
518518
if (memcmp("/dev/null", line, 9) || line[9] != '\n')
519-
die("git-apply: bad git-diff - expected /dev/null on line %d", linenr);
519+
die("git apply: bad git-diff - expected /dev/null on line %d", linenr);
520520
return NULL;
521521
}
522522
}

‎builtin-archive.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,18 @@ static int run_remote_archiver(const char *remote, int argc,
4747

4848
len = packet_read_line(fd[0], buf, sizeof(buf));
4949
if (!len)
50-
die("git-archive: expected ACK/NAK, got EOF");
50+
die("git archive: expected ACK/NAK, got EOF");
5151
if (buf[len-1] == '\n')
5252
buf[--len] = 0;
5353
if (strcmp(buf, "ACK")) {
5454
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");
5757
}
5858

5959
len = packet_read_line(fd[0], buf, sizeof(buf));
6060
if (len)
61-
die("git-archive: expected a flush");
61+
die("git archive: expected a flush");
6262

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

‎builtin-blame.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1791,7 +1791,7 @@ static int prepare_lines(struct scoreboard *sb)
17911791

17921792
/*
17931793
* 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
17951795
* to its clients.
17961796
*/
17971797
static int read_ancestry(const char *graft_file)

‎builtin-bundle.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
* Basic handler for bundle files to connect repositories via sneakernet.
77
* Invocation must include action.
88
* 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".
1010
*/
1111

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]... )";
1313

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

‎builtin-cat-file.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
137137
break;
138138

139139
default:
140-
die("git-cat-file: unknown option: %s\n", exp_type);
140+
die("git cat-file: unknown option: %s\n", exp_type);
141141
}
142142

143143
if (!buf)
144-
die("git-cat-file %s: bad file", obj_name);
144+
die("git cat-file %s: bad file", obj_name);
145145

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

‎builtin-check-ref-format.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
1010
{
1111
if (argc != 2)
12-
usage("git-check-ref-format refname");
12+
usage("git check-ref-format refname");
1313
return !!check_ref_format(argv[1]);
1414
}

‎builtin-checkout-index.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,9 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
258258
const char *p;
259259

260260
if (all)
261-
die("git-checkout-index: don't mix '--all' and explicit filenames");
261+
die("git checkout-index: don't mix '--all' and explicit filenames");
262262
if (read_from_stdin)
263-
die("git-checkout-index: don't mix '--stdin' and explicit filenames");
263+
die("git checkout-index: don't mix '--stdin' and explicit filenames");
264264
p = prefix_path(prefix, prefix_length, arg);
265265
checkout_file(p, prefix_length);
266266
if (p < arg || p > arg + strlen(arg))
@@ -271,7 +271,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
271271
struct strbuf buf, nbuf;
272272

273273
if (all)
274-
die("git-checkout-index: don't mix '--all' and '--stdin'");
274+
die("git checkout-index: don't mix '--all' and '--stdin'");
275275

276276
strbuf_init(&buf, 0);
277277
strbuf_init(&nbuf, 0);

‎builtin-commit-tree.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
118118
}
119119

120120
if (strbuf_read(&buffer, 0, 0) < 0)
121-
die("git-commit-tree: read returned %s", strerror(errno));
121+
die("git commit-tree: read returned %s", strerror(errno));
122122

123123
if (!commit_tree(buffer.buf, tree_sha1, parents, commit_sha1)) {
124124
printf("%s\n", sha1_to_hex(commit_sha1));

‎builtin-fetch-pack.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ static struct ref *do_fetch_pack(int fd[2],
609609
fprintf(stderr, "warning: no common commits\n");
610610

611611
if (get_pack(fd, pack_lockfile))
612-
die("git-fetch-pack: fetch failed.");
612+
die("git fetch-pack: fetch failed.");
613613

614614
all_done:
615615
return ref;

‎builtin-grep.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
774774
/* Make sure we do not get outside of paths */
775775
for (i = 0; paths[i]; i++)
776776
if (strncmp(prefix, paths[i], opt.prefix_length))
777-
die("git-grep: cannot generate relative filenames containing '..'");
777+
die("git grep: cannot generate relative filenames containing '..'");
778778
}
779779
}
780780
else if (prefix) {

0 commit comments

Comments
 (0)