kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Heikki Orsila 2008-08-30 14:12:53 +03:00 committed by Junio C Hamano
parent 53d1589ff6
commit 34baebcee1
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-apply.c
View File

@ -274,7 +274,7 @@ static void say_patch_name(FILE *output, const char *pre,
static void read_patch_file(struct strbuf *sb, int fd) static void read_patch_file(struct strbuf *sb, int fd)
{ {
if (strbuf_read(sb, fd, 0) < 0) 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

8
builtin-archive.c
View File

@ -47,18 +47,18 @@ static int run_remote_archiver(const char *remote, int argc,


len = packet_read_line(fd[0], buf, sizeof(buf)); len = packet_read_line(fd[0], buf, sizeof(buf));
if (!len) if (!len)
die("git-archive: expected ACK/NAK, got EOF"); die("git archive: expected ACK/NAK, got EOF");
if (buf[len-1] == '\n') if (buf[len-1] == '\n')
buf[--len] = 0; buf[--len] = 0;
if (strcmp(buf, "ACK")) { if (strcmp(buf, "ACK")) {
if (len > 5 && !prefixcmp(buf, "NACK ")) if (len > 5 && !prefixcmp(buf, "NACK "))
die("git-archive: NACK %s", buf + 5); die("git archive: NACK %s", buf + 5);
die("git-archive: protocol error"); die("git archive: protocol error");
} }


len = packet_read_line(fd[0], buf, sizeof(buf)); len = packet_read_line(fd[0], buf, sizeof(buf));
if (len) 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 */ /* Now, start reading from fd[0] and spit it out to stdout */
rv = recv_sideband("archive", fd[0], 1, 2); rv = recv_sideband("archive", fd[0], 1, 2);

2
builtin-blame.c
View File

@ -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. * to its clients.
*/ */
static int read_ancestry(const char *graft_file) static int read_ancestry(const char *graft_file)

4
builtin-bundle.c
View File

@ -6,10 +6,10 @@
* Basic handler for bundle files to connect repositories via sneakernet. * Basic handler for bundle files to connect repositories via sneakernet.
* Invocation must include action. * Invocation must include action.
* This function can create a bundle or provide information on an existing * 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)
{ {

4
builtin-cat-file.c
View File

@ -137,11 +137,11 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
break; break;


default: 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); write_or_die(1, buf, size);
return 0; return 0;

2
builtin-check-ref-format.c
View File

@ -9,6 +9,6 @@
int cmd_check_ref_format(int argc, const char **argv, const char *prefix) int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
{ {
if (argc != 2) 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]);
} }