mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'da/downcase-u-in-usage'
* da/downcase-u-in-usage: contrib/mw-to-git/t/install-wiki.sh: use a lowercase "usage:" string contrib/examples/git-remote.perl: use a lowercase "usage:" string tests: use a lowercase "usage:" string git-svn: use a lowercase "usage:" string Documentation/user-manual.txt: use a lowercase "usage:" string templates/hooks--update.sample: use a lowercase "usage:" string contrib/hooks/setgitperms.perl: use a lowercase "usage:" string contrib/examples: use a lowercase "usage:" string contrib/fast-import/import-zips.py: use spaces instead of tabs contrib/fast-import/import-zips.py: fix broken error message contrib/fast-import: use a lowercase "usage:" string contrib/credential: use a lowercase "usage:" string git-cvsimport: use a lowercase "usage:" string git-cvsimport: use a lowercase "usage:" string git-cvsexportcommit: use a lowercase "usage:" string git-archimport: use a lowercase "usage:" string git-merge-one-file: use a lowercase "usage:" string git-relink: use a lowercase "usage:" string git-svn: use a lowercase "usage:" string git-sh-setup: use a lowercase "usage:" string
This commit is contained in:
commit
c2bf648b84
|
@ -2337,7 +2337,7 @@ origin)
|
|||
fi
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 origin|test|release" 1>&2
|
||||
echo "usage: $0 origin|test|release" 1>&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
@ -2351,7 +2351,7 @@ pname=$0
|
|||
|
||||
usage()
|
||||
{
|
||||
echo "Usage: $pname branch test|release" 1>&2
|
||||
echo "usage: $pname branch test|release" 1>&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
|
|
|
@ -401,7 +401,7 @@ static void usage(const char *name)
|
|||
const char *basename = strrchr(name,'/');
|
||||
|
||||
basename = (basename) ? basename + 1 : name;
|
||||
fprintf(stderr, "Usage: %s <", basename);
|
||||
fprintf(stderr, "usage: %s <", basename);
|
||||
while(try_op->name) {
|
||||
fprintf(stderr,"%s",(try_op++)->name);
|
||||
if(try_op->name)
|
||||
|
|
|
@ -154,7 +154,7 @@ static void read_credential(void)
|
|||
int main(int argc, const char **argv)
|
||||
{
|
||||
const char *usage =
|
||||
"Usage: git credential-osxkeychain <get|store|erase>";
|
||||
"usage: git credential-osxkeychain <get|store|erase>";
|
||||
|
||||
if (!argv[1])
|
||||
die(usage);
|
||||
|
|
|
@ -259,7 +259,7 @@ static void read_credential(void)
|
|||
int main(int argc, char *argv[])
|
||||
{
|
||||
const char *usage =
|
||||
"Usage: git credential-wincred <get|store|erase>\n";
|
||||
"usage: git credential-wincred <get|store|erase>\n";
|
||||
|
||||
if (!argv[1])
|
||||
die(usage);
|
||||
|
|
|
@ -347,7 +347,7 @@ sub rm_remote {
|
|||
}
|
||||
|
||||
sub add_usage {
|
||||
print STDERR "Usage: git remote add [-f] [-t track]* [-m master] <name> <url>\n";
|
||||
print STDERR "usage: git remote add [-f] [-t track]* [-m master] <name> <url>\n";
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
@ -380,7 +380,7 @@ sub add_usage {
|
|||
}
|
||||
}
|
||||
if ($i >= @ARGV) {
|
||||
print STDERR "Usage: git remote show <remote>\n";
|
||||
print STDERR "usage: git remote show <remote>\n";
|
||||
exit(1);
|
||||
}
|
||||
my $status = 0;
|
||||
|
@ -410,7 +410,7 @@ sub add_usage {
|
|||
}
|
||||
}
|
||||
if ($i >= @ARGV) {
|
||||
print STDERR "Usage: git remote prune <remote>\n";
|
||||
print STDERR "usage: git remote prune <remote>\n";
|
||||
exit(1);
|
||||
}
|
||||
my $status = 0;
|
||||
|
@ -458,13 +458,13 @@ sub add_usage {
|
|||
}
|
||||
elsif ($ARGV[0] eq 'rm') {
|
||||
if (@ARGV <= 1) {
|
||||
print STDERR "Usage: git remote rm <remote>\n";
|
||||
print STDERR "usage: git remote rm <remote>\n";
|
||||
exit(1);
|
||||
}
|
||||
exit(rm_remote($ARGV[1]));
|
||||
}
|
||||
else {
|
||||
print STDERR "Usage: git remote\n";
|
||||
print STDERR "usage: git remote\n";
|
||||
print STDERR " git remote add <name> <url>\n";
|
||||
print STDERR " git remote rm <name>\n";
|
||||
print STDERR " git remote show <name>\n";
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
sub usage() {
|
||||
print STDERR <<END;
|
||||
Usage: ${\basename $0} # fetch/update GIT from SVN
|
||||
usage: ${\basename $0} # fetch/update GIT from SVN
|
||||
[-o branch-for-HEAD] [-h] [-v] [-l max_rev] [-R repack_each_revs]
|
||||
[-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname]
|
||||
[-d|-D] [-i] [-u] [-r] [-I ignorefilename] [-s start_chg]
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
use strict;
|
||||
use File::Find;
|
||||
|
||||
my $USAGE = 'Usage: git-import branch import-message';
|
||||
my $USAGE = 'usage: git-import branch import-message';
|
||||
my $branch = shift or die "$USAGE\n";
|
||||
my $message = shift or die "$USAGE\n";
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
# but is meant to be a simple fast-import example.
|
||||
|
||||
if [ -z "$1" -o -z "$2" ]; then
|
||||
echo "Usage: git-import branch import-message"
|
||||
echo "usage: git-import branch import-message"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
|
@ -14,13 +14,13 @@
|
|||
from zipfile import ZipFile
|
||||
|
||||
if hexversion < 0x01060000:
|
||||
# The limiter is the zipfile module
|
||||
sys.stderr.write("import-zips.py: requires Python 1.6.0 or later.\n")
|
||||
sys.exit(1)
|
||||
# The limiter is the zipfile module
|
||||
stderr.write("import-zips.py: requires Python 1.6.0 or later.\n")
|
||||
exit(1)
|
||||
|
||||
if len(argv) < 2:
|
||||
print 'Usage:', argv[0], '<zipfile>...'
|
||||
exit(1)
|
||||
print 'usage:', argv[0], '<zipfile>...'
|
||||
exit(1)
|
||||
|
||||
branch_ref = 'refs/heads/import-zips'
|
||||
committer_name = 'Z Ip Creator'
|
||||
|
@ -28,51 +28,51 @@
|
|||
|
||||
fast_import = popen('git fast-import --quiet', 'w')
|
||||
def printlines(list):
|
||||
for str in list:
|
||||
fast_import.write(str + "\n")
|
||||
for str in list:
|
||||
fast_import.write(str + "\n")
|
||||
|
||||
for zipfile in argv[1:]:
|
||||
commit_time = 0
|
||||
next_mark = 1
|
||||
common_prefix = None
|
||||
mark = dict()
|
||||
commit_time = 0
|
||||
next_mark = 1
|
||||
common_prefix = None
|
||||
mark = dict()
|
||||
|
||||
zip = ZipFile(zipfile, 'r')
|
||||
for name in zip.namelist():
|
||||
if name.endswith('/'):
|
||||
continue
|
||||
info = zip.getinfo(name)
|
||||
zip = ZipFile(zipfile, 'r')
|
||||
for name in zip.namelist():
|
||||
if name.endswith('/'):
|
||||
continue
|
||||
info = zip.getinfo(name)
|
||||
|
||||
if commit_time < info.date_time:
|
||||
commit_time = info.date_time
|
||||
if common_prefix == None:
|
||||
common_prefix = name[:name.rfind('/') + 1]
|
||||
else:
|
||||
while not name.startswith(common_prefix):
|
||||
last_slash = common_prefix[:-1].rfind('/') + 1
|
||||
common_prefix = common_prefix[:last_slash]
|
||||
if commit_time < info.date_time:
|
||||
commit_time = info.date_time
|
||||
if common_prefix == None:
|
||||
common_prefix = name[:name.rfind('/') + 1]
|
||||
else:
|
||||
while not name.startswith(common_prefix):
|
||||
last_slash = common_prefix[:-1].rfind('/') + 1
|
||||
common_prefix = common_prefix[:last_slash]
|
||||
|
||||
mark[name] = ':' + str(next_mark)
|
||||
next_mark += 1
|
||||
mark[name] = ':' + str(next_mark)
|
||||
next_mark += 1
|
||||
|
||||
printlines(('blob', 'mark ' + mark[name], \
|
||||
'data ' + str(info.file_size)))
|
||||
fast_import.write(zip.read(name) + "\n")
|
||||
printlines(('blob', 'mark ' + mark[name], \
|
||||
'data ' + str(info.file_size)))
|
||||
fast_import.write(zip.read(name) + "\n")
|
||||
|
||||
committer = committer_name + ' <' + committer_email + '> %d +0000' % \
|
||||
mktime(commit_time + (0, 0, 0))
|
||||
committer = committer_name + ' <' + committer_email + '> %d +0000' % \
|
||||
mktime(commit_time + (0, 0, 0))
|
||||
|
||||
printlines(('commit ' + branch_ref, 'committer ' + committer, \
|
||||
'data <<EOM', 'Imported from ' + zipfile + '.', 'EOM', \
|
||||
'', 'deleteall'))
|
||||
printlines(('commit ' + branch_ref, 'committer ' + committer, \
|
||||
'data <<EOM', 'Imported from ' + zipfile + '.', 'EOM', \
|
||||
'', 'deleteall'))
|
||||
|
||||
for name in mark.keys():
|
||||
fast_import.write('M 100644 ' + mark[name] + ' ' +
|
||||
name[len(common_prefix):] + "\n")
|
||||
for name in mark.keys():
|
||||
fast_import.write('M 100644 ' + mark[name] + ' ' +
|
||||
name[len(common_prefix):] + "\n")
|
||||
|
||||
printlines(('', 'tag ' + path.basename(zipfile), \
|
||||
'from ' + branch_ref, 'tagger ' + committer, \
|
||||
'data <<EOM', 'Package ' + zipfile, 'EOM', ''))
|
||||
printlines(('', 'tag ' + path.basename(zipfile), \
|
||||
'from ' + branch_ref, 'tagger ' + committer, \
|
||||
'data <<EOM', 'Package ' + zipfile, 'EOM', ''))
|
||||
|
||||
if fast_import.close():
|
||||
exit(1)
|
||||
exit(1)
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
use File::Basename;
|
||||
|
||||
my $usage =
|
||||
"Usage: setgitperms.perl [OPTION]... <--read|--write>
|
||||
"usage: setgitperms.perl [OPTION]... <--read|--write>
|
||||
This program uses a file `.gitmeta` to store/restore permissions and uid/gid
|
||||
info for all files/dirs tracked by git in the repository.
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ fi
|
|||
|
||||
. "$WIKI_TEST_DIR"/test-gitmw-lib.sh
|
||||
usage () {
|
||||
echo "Usage: "
|
||||
echo "usage: "
|
||||
echo " ./install-wiki.sh <install | delete | --help>"
|
||||
echo " install | -i : Install a wiki on your computer."
|
||||
echo " delete | -d : Delete the wiki and all its pages and "
|
||||
|
|
|
@ -75,7 +75,7 @@ =head1 Devel Notes
|
|||
|
||||
sub usage() {
|
||||
print STDERR <<END;
|
||||
Usage: git archimport # fetch/update GIT from Arch
|
||||
usage: git archimport # fetch/update GIT from Arch
|
||||
[ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ] [ -D depth ] [ -t tempdir ]
|
||||
repository/arch-branch [ repository/arch-branch] ...
|
||||
END
|
||||
|
|
|
@ -420,7 +420,7 @@
|
|||
|
||||
sub usage {
|
||||
print STDERR <<END;
|
||||
Usage: GIT_DIR=/path/to/.git git cvsexportcommit [-h] [-p] [-v] [-c] [-f] [-u] [-k] [-w cvsworkdir] [-m msgprefix] [ parent ] commit
|
||||
usage: GIT_DIR=/path/to/.git git cvsexportcommit [-h] [-p] [-v] [-c] [-f] [-u] [-k] [-w cvsworkdir] [-m msgprefix] [ parent ] commit
|
||||
END
|
||||
exit(1);
|
||||
}
|
||||
|
|
|
@ -38,7 +38,7 @@ (;$)
|
|||
my $msg = shift;
|
||||
print(STDERR "Error: $msg\n") if $msg;
|
||||
print STDERR <<END;
|
||||
Usage: git cvsimport # fetch/update GIT from CVS
|
||||
usage: git cvsimport # fetch/update GIT from CVS
|
||||
[-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file]
|
||||
[-p opts-for-cvsps] [-P file] [-C GIT_repository] [-z fuzz] [-i] [-k]
|
||||
[-u] [-s subst] [-a] [-m] [-M regex] [-S regex] [-L commitlimit]
|
||||
|
|
|
@ -107,7 +107,7 @@
|
|||
$log->info("--------------- STARTING -----------------");
|
||||
|
||||
my $usage =
|
||||
"Usage: git cvsserver [options] [pserver|server] [<directory> ...]\n".
|
||||
"usage: git cvsserver [options] [pserver|server] [<directory> ...]\n".
|
||||
" --base-path <path> : Prepend to requested CVSROOT\n".
|
||||
" Can be read from GIT_CVSSERVER_BASE_PATH\n".
|
||||
" --strict-paths : Don't allow recursing into subdirectories\n".
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
USAGE='<orig blob> <our blob> <their blob> <path>'
|
||||
USAGE="$USAGE <orig mode> <our mode> <their mode>"
|
||||
LONG_USAGE="Usage: git merge-one-file $USAGE
|
||||
LONG_USAGE="usage: git merge-one-file $USAGE
|
||||
|
||||
Blob ids and modes should be empty for missing files."
|
||||
|
||||
|
|
|
@ -163,7 +163,7 @@ ($$)
|
|||
|
||||
|
||||
sub usage() {
|
||||
print("Usage: git relink [--safe] <dir>... <master_dir> \n");
|
||||
print("usage: git relink [--safe] <dir>... <master_dir> \n");
|
||||
print("All directories should contain a .git/objects/ subdirectory.\n");
|
||||
print("Options\n");
|
||||
print("\t--safe\t" .
|
||||
|
|
|
@ -84,14 +84,14 @@ if test -n "$OPTIONS_SPEC"; then
|
|||
else
|
||||
dashless=$(basename "$0" | sed -e 's/-/ /')
|
||||
usage() {
|
||||
die "Usage: $dashless $USAGE"
|
||||
die "usage: $dashless $USAGE"
|
||||
}
|
||||
|
||||
if [ -z "$LONG_USAGE" ]
|
||||
then
|
||||
LONG_USAGE="Usage: $dashless $USAGE"
|
||||
LONG_USAGE="usage: $dashless $USAGE"
|
||||
else
|
||||
LONG_USAGE="Usage: $dashless $USAGE
|
||||
LONG_USAGE="usage: $dashless $USAGE
|
||||
|
||||
$LONG_USAGE"
|
||||
fi
|
||||
|
|
|
@ -382,7 +382,7 @@ sub usage {
|
|||
my $fd = $exit ? \*STDERR : \*STDOUT;
|
||||
print $fd <<"";
|
||||
git-svn - bidirectional operations between a single Subversion tree and git
|
||||
Usage: git svn <command> [options] [arguments]\n
|
||||
usage: git svn <command> [options] [arguments]\n
|
||||
|
||||
print $fd "Available commands:\n" unless $cmd;
|
||||
|
||||
|
@ -534,7 +534,7 @@ sub cmd_fetch {
|
|||
}
|
||||
my ($remote) = @_;
|
||||
if (@_ > 1) {
|
||||
die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n";
|
||||
die "usage: $0 fetch [--all] [--parent] [svn-remote]\n";
|
||||
}
|
||||
$Git::SVN::no_reuse_existing = undef;
|
||||
if ($_fetch_parent) {
|
||||
|
@ -1404,7 +1404,7 @@ sub cmd_multi_fetch {
|
|||
# this command is special because it requires no metadata
|
||||
sub cmd_commit_diff {
|
||||
my ($ta, $tb, $url) = @_;
|
||||
my $usage = "Usage: $0 commit-diff -r<revision> ".
|
||||
my $usage = "usage: $0 commit-diff -r<revision> ".
|
||||
"<tree-ish> <tree-ish> [<URL>]";
|
||||
fatal($usage) if (!defined $ta || !defined $tb);
|
||||
my $svn_path = '';
|
||||
|
|
|
@ -148,7 +148,7 @@ stop_httpd () {
|
|||
convert_to_rev_db () {
|
||||
"$PERL_PATH" -w -- - "$@" <<\EOF
|
||||
use strict;
|
||||
@ARGV == 2 or die "Usage: convert_to_rev_db <input> <output>";
|
||||
@ARGV == 2 or die "usage: convert_to_rev_db <input> <output>";
|
||||
open my $wr, '+>', $ARGV[1] or die "$!: couldn't open: $ARGV[1]";
|
||||
open my $rd, '<', $ARGV[0] or die "$!: couldn't open: $ARGV[0]";
|
||||
my $size = (stat($rd))[7];
|
||||
|
|
|
@ -14,7 +14,7 @@ xmkdir() {
|
|||
|
||||
R="$1"
|
||||
|
||||
[ -n "$R" ] || die "Usage: prepare-chroot.sh <root>"
|
||||
[ -n "$R" ] || die "usage: prepare-chroot.sh <root>"
|
||||
[ -x git ] || die "This script needs to be executed at git source code's top directory"
|
||||
[ -x /bin/busybox ] || die "You need busybox"
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ if [ -z "$GIT_DIR" ]; then
|
|||
fi
|
||||
|
||||
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
|
||||
echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
|
||||
echo "usage: $0 <ref> <oldrev> <newrev>" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
|
@ -114,6 +114,6 @@ int main(int argc, const char *argv[])
|
|||
return 0;
|
||||
|
||||
usage:
|
||||
fprintf(stderr, "Usage: %s %s\n", argv[0], usage_str);
|
||||
fprintf(stderr, "usage: %s %s\n", argv[0], usage_str);
|
||||
return -1;
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ int main(int argc, char *argv[])
|
|||
unsigned long from_size, data_size, out_size;
|
||||
|
||||
if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p"))) {
|
||||
fprintf(stderr, "Usage: %s\n", usage_str);
|
||||
fprintf(stderr, "usage: %s\n", usage_str);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ int main(int argc, char *argv[])
|
|||
unsigned char *c;
|
||||
|
||||
if (argc < 2 || argc > 3) {
|
||||
fprintf(stderr, "Usage: %s <seed_string> [<size>]\n", argv[0]);
|
||||
fprintf(stderr, "usage: %s <seed_string> [<size>]\n", argv[0]);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue