diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-16 01:24:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-16 01:24:58 -0700 |
| commit | 97d7fee2cb068f215a593c6e5623b265db45d3bc (patch) | |
| tree | 6179e15deb7b34d3d2c6236077e7ad8454457942 /builtin-tar-tree.c | |
| parent | 132c6e443cb76d0baf9eece7b9424d25dc83a91d (diff) | |
| parent | 1f5a892e5209be329dda316edb0341066d62e3eb (diff) | |
| download | git-97d7fee2cb068f215a593c6e5623b265db45d3bc.tar.gz | |
Merge branch 'maint'
* maint:
Cosmetical command name fix
Start conforming code to "git subcmd" style part 3
t9700/test.pl: remove File::Temp requirement
t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
Diffstat (limited to 'builtin-tar-tree.c')
| -rw-r--r-- | builtin-tar-tree.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c index cb7007e25f..0713bca778 100644 --- a/builtin-tar-tree.c +++ b/builtin-tar-tree.c @@ -9,26 +9,26 @@ static const char tar_tree_usage[] = "git tar-tree [--remote=<repo>] <tree-ish> [basedir]\n" -"*** Note that this command is now deprecated; use git-archive instead."; +"*** Note that this command is now deprecated; use \"git archive\" instead."; int cmd_tar_tree(int argc, const char **argv, const char *prefix) { /* - * git-tar-tree is now a wrapper around git-archive --format=tar + * "git tar-tree" is now a wrapper around "git archive --format=tar" * * $0 --remote=<repo> arg... ==> - * git-archive --format=tar --remote=<repo> arg... + * git archive --format=tar --remote=<repo> arg... * $0 tree-ish ==> - * git-archive --format=tar tree-ish + * git archive --format=tar tree-ish * $0 tree-ish basedir ==> - * git-archive --format-tar --prefix=basedir tree-ish + * git archive --format-tar --prefix=basedir tree-ish */ int i; const char **nargv = xcalloc(sizeof(*nargv), argc + 2); char *basedir_arg; int nargc = 0; - nargv[nargc++] = "git-archive"; + nargv[nargc++] = "archive"; nargv[nargc++] = "--format=tar"; if (2 <= argc && !prefixcmp(argv[1], "--remote=")) { @@ -53,8 +53,8 @@ int cmd_tar_tree(int argc, const char **argv, const char *prefix) nargv[nargc] = NULL; fprintf(stderr, - "*** git-tar-tree is now deprecated.\n" - "*** Running git-archive instead.\n***"); + "*** \"git tar-tree\" is now deprecated.\n" + "*** Running \"git archive\" instead.\n***"); for (i = 0; i < nargc; i++) { fputc(' ', stderr); sq_quote_print(stderr, nargv[i]); |