From 0b54366cddfc2ad7549b1ab01fe2d5f993d1ab58 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 23 Feb 2013 16:50:09 -0800 Subject: git-sh-setup: use a lowercase "usage:" string mergetool, bisect, and other commands that use git-sh-setup print a usage string that is inconsistent with the rest of Git when they are invoked as "git $cmd -h". The compiled builtins use the lowercase "usage:" string but these commands say "Usage:". Adjust the shell library to make these consistent. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-sh-setup.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 795edd2852..9cfbe7f143 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -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 -- cgit v1.2.3 From 1ca6e587c93bfce9d7b2ef1a98eecb7ce99b38f8 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 23 Feb 2013 16:50:10 -0800 Subject: git-svn: use a lowercase "usage:" string Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-svn.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-svn.perl b/git-svn.perl index b46795f593..a93166fbd4 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -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 [options] [arguments]\n +usage: git svn [options] [arguments]\n print $fd "Available commands:\n" unless $cmd; -- cgit v1.2.3 From 8d8bbc3644aedf1a189ded0d866311e5a0da1ec8 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 23 Feb 2013 16:50:11 -0800 Subject: git-relink: use a lowercase "usage:" string Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-relink.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-relink.perl b/git-relink.perl index f29285c411..236a3521a1 100755 --- a/git-relink.perl +++ b/git-relink.perl @@ -163,7 +163,7 @@ sub link_two_files($$) { sub usage() { - print("Usage: git relink [--safe] ... \n"); + print("usage: git relink [--safe] ... \n"); print("All directories should contain a .git/objects/ subdirectory.\n"); print("Options\n"); print("\t--safe\t" . -- cgit v1.2.3 From e5a1518ef40aea657aec64c1507553bde6fac105 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 23 Feb 2013 16:50:12 -0800 Subject: git-merge-one-file: use a lowercase "usage:" string Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-merge-one-file.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index f612cb847a..3373c040d4 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -18,7 +18,7 @@ USAGE=' ' USAGE="$USAGE " -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." -- cgit v1.2.3 From 165c4b136573405f3d9c3af56a5e67acb058990b Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 23 Feb 2013 16:50:13 -0800 Subject: git-archimport: use a lowercase "usage:" string Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-archimport.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-archimport.perl b/git-archimport.perl index bc32f18d6d..9cb123a07d 100755 --- a/git-archimport.perl +++ b/git-archimport.perl @@ -75,7 +75,7 @@ our($opt_h,$opt_f,$opt_v,$opt_T,$opt_t,$opt_D,$opt_a,$opt_o); sub usage() { print STDERR < Date: Sat, 23 Feb 2013 16:50:14 -0800 Subject: git-cvsexportcommit: use a lowercase "usage:" string Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-cvsexportcommit.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl index e6bf25232c..d13f02da95 100755 --- a/git-cvsexportcommit.perl +++ b/git-cvsexportcommit.perl @@ -420,7 +420,7 @@ sleep(1); sub usage { print STDERR < Date: Sat, 23 Feb 2013 16:50:15 -0800 Subject: git-cvsimport: use a lowercase "usage:" string Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-cvsimport.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 344f1206d1..73d367cea8 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -38,7 +38,7 @@ sub usage(;$) { my $msg = shift; print(STDERR "Error: $msg\n") if $msg; print STDERR < Date: Sat, 23 Feb 2013 16:50:16 -0800 Subject: git-cvsimport: use a lowercase "usage:" string Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-cvsserver.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 3679074983..f1c3f49a83 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -107,7 +107,7 @@ my $work = $log->info("--------------- STARTING -----------------"); my $usage = - "Usage: git cvsserver [options] [pserver|server] [ ...]\n". + "usage: git cvsserver [options] [pserver|server] [ ...]\n". " --base-path : Prepend to requested CVSROOT\n". " Can be read from GIT_CVSSERVER_BASE_PATH\n". " --strict-paths : Don't allow recursing into subdirectories\n". -- cgit v1.2.3 From c358ed756e6a6c6f762b453dd3698fa06bbb9664 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 23 Feb 2013 16:50:17 -0800 Subject: contrib/credential: use a lowercase "usage:" string Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- contrib/credential/gnome-keyring/git-credential-gnome-keyring.c | 2 +- contrib/credential/osxkeychain/git-credential-osxkeychain.c | 2 +- contrib/credential/wincred/git-credential-wincred.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c index 41f61c5db3..f2cdefee60 100644 --- a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c +++ b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c @@ -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) diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c index 6beed123ab..3940202b36 100644 --- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c +++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c @@ -154,7 +154,7 @@ static void read_credential(void) int main(int argc, const char **argv) { const char *usage = - "Usage: git credential-osxkeychain "; + "usage: git credential-osxkeychain "; if (!argv[1]) die(usage); diff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c index cbaec5f24b..66194929fc 100644 --- a/contrib/credential/wincred/git-credential-wincred.c +++ b/contrib/credential/wincred/git-credential-wincred.c @@ -313,7 +313,7 @@ static void read_credential(void) int main(int argc, char *argv[]) { const char *usage = - "Usage: git credential-wincred \n"; + "usage: git credential-wincred \n"; if (!argv[1]) die(usage); -- cgit v1.2.3 From dd3a4ad95f5d10d8756fdf337004bb41b230b0fe Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 23 Feb 2013 16:50:18 -0800 Subject: contrib/fast-import: use a lowercase "usage:" string Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- contrib/fast-import/git-import.perl | 2 +- contrib/fast-import/git-import.sh | 2 +- contrib/fast-import/import-zips.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/fast-import/git-import.perl b/contrib/fast-import/git-import.perl index f9fef6db28..0891b9e366 100755 --- a/contrib/fast-import/git-import.perl +++ b/contrib/fast-import/git-import.perl @@ -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"; diff --git a/contrib/fast-import/git-import.sh b/contrib/fast-import/git-import.sh index 0ca7718d05..f8d803c5e2 100755 --- a/contrib/fast-import/git-import.sh +++ b/contrib/fast-import/git-import.sh @@ -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 diff --git a/contrib/fast-import/import-zips.py b/contrib/fast-import/import-zips.py index 5cec9b0129..8f2923d359 100755 --- a/contrib/fast-import/import-zips.py +++ b/contrib/fast-import/import-zips.py @@ -19,7 +19,7 @@ if hexversion < 0x01060000: sys.exit(1) if len(argv) < 2: - print 'Usage:', argv[0], '...' + print 'usage:', argv[0], '...' exit(1) branch_ref = 'refs/heads/import-zips' -- cgit v1.2.3 From 61a7aaccf40a65840f5017901c8f4c19253c395a Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 23 Feb 2013 16:50:19 -0800 Subject: contrib/fast-import/import-zips.py: fix broken error message The 'sys' module is not imported but all of the bits we want from it are. Adjust the script to not fail when run on old Python versions and fix the inconsistent use of tabs. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- contrib/fast-import/import-zips.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/fast-import/import-zips.py b/contrib/fast-import/import-zips.py index 8f2923d359..1936a730b2 100755 --- a/contrib/fast-import/import-zips.py +++ b/contrib/fast-import/import-zips.py @@ -15,8 +15,8 @@ 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) + stderr.write("import-zips.py: requires Python 1.6.0 or later.\n") + exit(1) if len(argv) < 2: print 'usage:', argv[0], '...' -- cgit v1.2.3 From e257f0551fdf9351dc3f8796ef3ca11b255b8a04 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 23 Feb 2013 16:50:20 -0800 Subject: contrib/fast-import/import-zips.py: use spaces instead of tabs Follow the conventional Python style by using 4-space indents instead of hard tabs. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- contrib/fast-import/import-zips.py | 98 +++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/contrib/fast-import/import-zips.py b/contrib/fast-import/import-zips.py index 1936a730b2..d12c296223 100755 --- a/contrib/fast-import/import-zips.py +++ b/contrib/fast-import/import-zips.py @@ -14,13 +14,13 @@ from time import mktime from zipfile import ZipFile if hexversion < 0x01060000: - # The limiter is the zipfile module - stderr.write("import-zips.py: requires Python 1.6.0 or later.\n") - 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], '...' - exit(1) + print 'usage:', argv[0], '...' + exit(1) branch_ref = 'refs/heads/import-zips' committer_name = 'Z Ip Creator' @@ -28,51 +28,51 @@ committer_email = 'zip@example.com' 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() - - 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] - - 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") - - committer = committer_name + ' <' + committer_email + '> %d +0000' % \ - mktime(commit_time + (0, 0, 0)) - - printlines(('commit ' + branch_ref, 'committer ' + committer, \ - 'data < %d +0000' % \ + mktime(commit_time + (0, 0, 0)) + + printlines(('commit ' + branch_ref, 'committer ' + committer, \ + 'data < Date: Sat, 23 Feb 2013 16:50:21 -0800 Subject: contrib/examples: use a lowercase "usage:" string Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- contrib/examples/git-remote.perl | 2 +- contrib/examples/git-svnimport.perl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/examples/git-remote.perl b/contrib/examples/git-remote.perl index b17952a785..b549a3c11f 100755 --- a/contrib/examples/git-remote.perl +++ b/contrib/examples/git-remote.perl @@ -347,7 +347,7 @@ sub rm_remote { } sub add_usage { - print STDERR "Usage: git remote add [-f] [-t track]* [-m master] \n"; + print STDERR "usage: git remote add [-f] [-t track]* [-m master] \n"; exit(1); } diff --git a/contrib/examples/git-svnimport.perl b/contrib/examples/git-svnimport.perl index b09ff8f12f..c414f0d9c7 100755 --- a/contrib/examples/git-svnimport.perl +++ b/contrib/examples/git-svnimport.perl @@ -36,7 +36,7 @@ our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T, sub usage() { print STDERR < Date: Sat, 23 Feb 2013 16:50:22 -0800 Subject: contrib/hooks/setgitperms.perl: use a lowercase "usage:" string Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- contrib/hooks/setgitperms.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/hooks/setgitperms.perl b/contrib/hooks/setgitperms.perl index a577ad095f..2770a1b1d2 100644 --- a/contrib/hooks/setgitperms.perl +++ b/contrib/hooks/setgitperms.perl @@ -24,7 +24,7 @@ use File::Find; 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. -- cgit v1.2.3 From 9a8a84c319e51eb25bfc0ee44d064617c310aa9e Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 23 Feb 2013 16:50:23 -0800 Subject: templates/hooks--update.sample: use a lowercase "usage:" string Make the usage string consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- templates/hooks--update.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/hooks--update.sample b/templates/hooks--update.sample index 71ab04edc0..d84758373d 100755 --- a/templates/hooks--update.sample +++ b/templates/hooks--update.sample @@ -38,7 +38,7 @@ if [ -z "$GIT_DIR" ]; then fi if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "Usage: $0 " >&2 + echo "usage: $0 " >&2 exit 1 fi -- cgit v1.2.3 From 1a2ba8b90fa74a01684b45a7beb88329c4b7793c Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sat, 23 Feb 2013 16:50:24 -0800 Subject: Documentation/user-manual.txt: use a lowercase "usage:" string Make the usage string in the example script consistent with Git. Reviewed-by: Jonathan Nieder Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- Documentation/user-manual.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 23689b0b93..d290632d18 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2341,7 +2341,7 @@ origin) fi ;; *) - echo "Usage: $0 origin|test|release" 1>&2 + echo "usage: $0 origin|test|release" 1>&2 exit 1 ;; esac @@ -2355,7 +2355,7 @@ pname=$0 usage() { - echo "Usage: $pname branch test|release" 1>&2 + echo "usage: $pname branch test|release" 1>&2 exit 1 } -- cgit v1.2.3 From 0b670abd974f50f3bf675d30c093cb7309151ac0 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sun, 24 Feb 2013 14:48:38 -0800 Subject: git-svn: use a lowercase "usage:" string Make the usage string consistent with Git. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-svn.perl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-svn.perl b/git-svn.perl index a93166fbd4..6c7bd95032 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -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 ". + my $usage = "usage: $0 commit-diff -r ". " []"; fatal($usage) if (!defined $ta || !defined $tb); my $svn_path = ''; -- cgit v1.2.3 From b978403aed7f2df46bc4c8a63314959d8982e0ac Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sun, 24 Feb 2013 14:48:39 -0800 Subject: tests: use a lowercase "usage:" string Adjust test commands and test suites so that their usage strings are consistent with Git. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- t/lib-git-svn.sh | 2 +- t/t1509/prepare-chroot.sh | 2 +- test-chmtime.c | 2 +- test-delta.c | 2 +- test-genrandom.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 199f22c231..c5e55b190b 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -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 "; +@ARGV == 2 or die "usage: convert_to_rev_db "; 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]; diff --git a/t/t1509/prepare-chroot.sh b/t/t1509/prepare-chroot.sh index c5334a8fa4..62691172e3 100755 --- a/t/t1509/prepare-chroot.sh +++ b/t/t1509/prepare-chroot.sh @@ -14,7 +14,7 @@ xmkdir() { R="$1" -[ -n "$R" ] || die "Usage: prepare-chroot.sh " +[ -n "$R" ] || die "usage: prepare-chroot.sh " [ -x git ] || die "This script needs to be executed at git source code's top directory" [ -x /bin/busybox ] || die "You need busybox" diff --git a/test-chmtime.c b/test-chmtime.c index 92713d16da..02b42badd5 100644 --- a/test-chmtime.c +++ b/test-chmtime.c @@ -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; } diff --git a/test-delta.c b/test-delta.c index af40a3c49e..4595cd6433 100644 --- a/test-delta.c +++ b/test-delta.c @@ -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; } diff --git a/test-genrandom.c b/test-genrandom.c index b3c28d9a1c..54824d0754 100644 --- a/test-genrandom.c +++ b/test-genrandom.c @@ -12,7 +12,7 @@ int main(int argc, char *argv[]) unsigned char *c; if (argc < 2 || argc > 3) { - fprintf(stderr, "Usage: %s []\n", argv[0]); + fprintf(stderr, "usage: %s []\n", argv[0]); return 1; } -- cgit v1.2.3 From f86cad716424019308d9b992468dbed1762dd8a4 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sun, 24 Feb 2013 14:48:40 -0800 Subject: contrib/examples/git-remote.perl: use a lowercase "usage:" string Make the usage string consistent with Git. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- contrib/examples/git-remote.perl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/examples/git-remote.perl b/contrib/examples/git-remote.perl index b549a3c11f..d42df7b418 100755 --- a/contrib/examples/git-remote.perl +++ b/contrib/examples/git-remote.perl @@ -380,7 +380,7 @@ elsif ($ARGV[0] eq 'show') { } } if ($i >= @ARGV) { - print STDERR "Usage: git remote show \n"; + print STDERR "usage: git remote show \n"; exit(1); } my $status = 0; @@ -410,7 +410,7 @@ elsif ($ARGV[0] eq 'prune') { } } if ($i >= @ARGV) { - print STDERR "Usage: git remote prune \n"; + print STDERR "usage: git remote prune \n"; exit(1); } my $status = 0; @@ -458,13 +458,13 @@ elsif ($ARGV[0] eq 'add') { } elsif ($ARGV[0] eq 'rm') { if (@ARGV <= 1) { - print STDERR "Usage: git remote rm \n"; + print STDERR "usage: git remote rm \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 \n"; print STDERR " git remote rm \n"; print STDERR " git remote show \n"; -- cgit v1.2.3 From ebffb3d03cceabf8d89a62435a4cdf3a22b68b5f Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sun, 24 Feb 2013 14:48:41 -0800 Subject: contrib/mw-to-git/t/install-wiki.sh: use a lowercase "usage:" string Make the usage string consistent with Git. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- contrib/mw-to-git/t/install-wiki.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/mw-to-git/t/install-wiki.sh b/contrib/mw-to-git/t/install-wiki.sh index c6d6fa3aef..70a53f67fd 100755 --- a/contrib/mw-to-git/t/install-wiki.sh +++ b/contrib/mw-to-git/t/install-wiki.sh @@ -15,7 +15,7 @@ fi . "$WIKI_TEST_DIR"/test-gitmw-lib.sh usage () { - echo "Usage: " + echo "usage: " echo " ./install-wiki.sh " echo " install | -i : Install a wiki on your computer." echo " delete | -d : Delete the wiki and all its pages and " -- cgit v1.2.3