Skip to content

Commit 41e603a

Browse files
gitstergitster
committed
Merge branch 'da/downcase-u-in-usage' into maint
* 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
2 parents 803a777 + ebffb3d commit 41e603a

25 files changed

Lines changed: 82 additions & 82 deletions

‎Documentation/user-manual.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2338,7 +2338,7 @@ origin)
23382338
fi
23392339
;;
23402340
*)
2341-
echo "Usage: $0 origin|test|release" 1>&2
2341+
echo "usage: $0 origin|test|release" 1>&2
23422342
exit 1
23432343
;;
23442344
esac
@@ -2352,7 +2352,7 @@ pname=$0
23522352

23532353
usage()
23542354
{
2355-
echo "Usage: $pname branch test|release" 1>&2
2355+
echo "usage: $pname branch test|release" 1>&2
23562356
exit 1
23572357
}
23582358

‎contrib/credential/gnome-keyring/git-credential-gnome-keyring.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ static void usage(const char *name)
401401
const char *basename = strrchr(name,'/');
402402

403403
basename = (basename) ? basename + 1 : name;
404-
fprintf(stderr, "Usage: %s <", basename);
404+
fprintf(stderr, "usage: %s <", basename);
405405
while(try_op->name) {
406406
fprintf(stderr,"%s",(try_op++)->name);
407407
if(try_op->name)

‎contrib/credential/osxkeychain/git-credential-osxkeychain.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static void read_credential(void)
154154
int main(int argc, const char **argv)
155155
{
156156
const char *usage =
157-
"Usage: git credential-osxkeychain <get|store|erase>";
157+
"usage: git credential-osxkeychain <get|store|erase>";
158158

159159
if (!argv[1])
160160
die(usage);

‎contrib/credential/wincred/git-credential-wincred.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ static void read_credential(void)
259259
int main(int argc, char *argv[])
260260
{
261261
const char *usage =
262-
"Usage: git credential-wincred <get|store|erase>\n";
262+
"usage: git credential-wincred <get|store|erase>\n";
263263

264264
if (!argv[1])
265265
die(usage);

‎contrib/examples/git-remote.perl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ sub rm_remote {
347347
}
348348

349349
sub add_usage {
350-
print STDERR "Usage: git remote add [-f] [-t track]* [-m master] <name> <url>\n";
350+
print STDERR "usage: git remote add [-f] [-t track]* [-m master] <name> <url>\n";
351351
exit(1);
352352
}
353353

@@ -380,7 +380,7 @@ sub add_usage {
380380
}
381381
}
382382
if ($i >= @ARGV) {
383-
print STDERR "Usage: git remote show <remote>\n";
383+
print STDERR "usage: git remote show <remote>\n";
384384
exit(1);
385385
}
386386
my $status = 0;
@@ -410,7 +410,7 @@ sub add_usage {
410410
}
411411
}
412412
if ($i >= @ARGV) {
413-
print STDERR "Usage: git remote prune <remote>\n";
413+
print STDERR "usage: git remote prune <remote>\n";
414414
exit(1);
415415
}
416416
my $status = 0;
@@ -458,13 +458,13 @@ sub add_usage {
458458
}
459459
elsif ($ARGV[0] eq 'rm') {
460460
if (@ARGV <= 1) {
461-
print STDERR "Usage: git remote rm <remote>\n";
461+
print STDERR "usage: git remote rm <remote>\n";
462462
exit(1);
463463
}
464464
exit(rm_remote($ARGV[1]));
465465
}
466466
else {
467-
print STDERR "Usage: git remote\n";
467+
print STDERR "usage: git remote\n";
468468
print STDERR " git remote add <name> <url>\n";
469469
print STDERR " git remote rm <name>\n";
470470
print STDERR " git remote show <name>\n";

‎contrib/examples/git-svnimport.perl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
sub usage() {
3838
print STDERR <<END;
39-
Usage: ${\basename $0} # fetch/update GIT from SVN
39+
usage: ${\basename $0} # fetch/update GIT from SVN
4040
[-o branch-for-HEAD] [-h] [-v] [-l max_rev] [-R repack_each_revs]
4141
[-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname]
4242
[-d|-D] [-i] [-u] [-r] [-I ignorefilename] [-s start_chg]

‎contrib/fast-import/git-import.perl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use strict;
88
use File::Find;
99

10-
my $USAGE = 'Usage: git-import branch import-message';
10+
my $USAGE = 'usage: git-import branch import-message';
1111
my $branch = shift or die "$USAGE\n";
1212
my $message = shift or die "$USAGE\n";
1313

‎contrib/fast-import/git-import.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# but is meant to be a simple fast-import example.
66

77
if [ -z "$1" -o -z "$2" ]; then
8-
echo "Usage: git-import branch import-message"
8+
echo "usage: git-import branch import-message"
99
exit 1
1010
fi
1111

‎contrib/fast-import/import-zips.py‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -14,65 +14,65 @@
1414
from zipfile import ZipFile
1515

1616
if hexversion < 0x01060000:
17-
# The limiter is the zipfile module
18-
sys.stderr.write("import-zips.py: requires Python 1.6.0 or later.\n")
19-
sys.exit(1)
17+
# The limiter is the zipfile module
18+
stderr.write("import-zips.py: requires Python 1.6.0 or later.\n")
19+
exit(1)
2020

2121
if len(argv) < 2:
22-
print 'Usage:', argv[0], '<zipfile>...'
23-
exit(1)
22+
print 'usage:', argv[0], '<zipfile>...'
23+
exit(1)
2424

2525
branch_ref = 'refs/heads/import-zips'
2626
committer_name = 'Z Ip Creator'
2727
committer_email = 'zip@example.com'
2828

2929
fast_import = popen('git fast-import --quiet', 'w')
3030
def printlines(list):
31-
for str in list:
32-
fast_import.write(str + "\n")
31+
for str in list:
32+
fast_import.write(str + "\n")
3333

3434
for zipfile in argv[1:]:
35-
commit_time = 0
36-
next_mark = 1
37-
common_prefix = None
38-
mark = dict()
39-
40-
zip = ZipFile(zipfile, 'r')
41-
for name in zip.namelist():
42-
if name.endswith('/'):
43-
continue
44-
info = zip.getinfo(name)
45-
46-
if commit_time < info.date_time:
47-
commit_time = info.date_time
48-
if common_prefix == None:
49-
common_prefix = name[:name.rfind('/') + 1]
50-
else:
51-
while not name.startswith(common_prefix):
52-
last_slash = common_prefix[:-1].rfind('/') + 1
53-
common_prefix = common_prefix[:last_slash]
54-
55-
mark[name] = ':' + str(next_mark)
56-
next_mark += 1
57-
58-
printlines(('blob', 'mark ' + mark[name], \
59-
'data ' + str(info.file_size)))
60-
fast_import.write(zip.read(name) + "\n")
61-
62-
committer = committer_name + ' <' + committer_email + '> %d +0000' % \
63-
mktime(commit_time + (0, 0, 0))
64-
65-
printlines(('commit ' + branch_ref, 'committer ' + committer, \
66-
'data <<EOM', 'Imported from ' + zipfile + '.', 'EOM', \
67-
'', 'deleteall'))
68-
69-
for name in mark.keys():
70-
fast_import.write('M 100644 ' + mark[name] + ' ' +
71-
name[len(common_prefix):] + "\n")
72-
73-
printlines(('', 'tag ' + path.basename(zipfile), \
74-
'from ' + branch_ref, 'tagger ' + committer, \
75-
'data <<EOM', 'Package ' + zipfile, 'EOM', ''))
35+
commit_time = 0
36+
next_mark = 1
37+
common_prefix = None
38+
mark = dict()
39+
40+
zip = ZipFile(zipfile, 'r')
41+
for name in zip.namelist():
42+
if name.endswith('/'):
43+
continue
44+
info = zip.getinfo(name)
45+
46+
if commit_time < info.date_time:
47+
commit_time = info.date_time
48+
if common_prefix == None:
49+
common_prefix = name[:name.rfind('/') + 1]
50+
else:
51+
while not name.startswith(common_prefix):
52+
last_slash = common_prefix[:-1].rfind('/') + 1
53+
common_prefix = common_prefix[:last_slash]
54+
55+
mark[name] = ':' + str(next_mark)
56+
next_mark += 1
57+
58+
printlines(('blob', 'mark ' + mark[name], \
59+
'data ' + str(info.file_size)))
60+
fast_import.write(zip.read(name) + "\n")
61+
62+
committer = committer_name + ' <' + committer_email + '> %d +0000' % \
63+
mktime(commit_time + (0, 0, 0))
64+
65+
printlines(('commit ' + branch_ref, 'committer ' + committer, \
66+
'data <<EOM', 'Imported from ' + zipfile + '.', 'EOM', \
67+
'', 'deleteall'))
68+
69+
for name in mark.keys():
70+
fast_import.write('M 100644 ' + mark[name] + ' ' +
71+
name[len(common_prefix):] + "\n")
72+
73+
printlines(('', 'tag ' + path.basename(zipfile), \
74+
'from ' + branch_ref, 'tagger ' + committer, \
75+
'data <<EOM', 'Package ' + zipfile, 'EOM', ''))
7676

7777
if fast_import.close():
78-
exit(1)
78+
exit(1)

‎contrib/hooks/setgitperms.perl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
use File::Basename;
2525

2626
my $usage =
27-
"Usage: setgitperms.perl [OPTION]... <--read|--write>
27+
"usage: setgitperms.perl [OPTION]... <--read|--write>
2828
This program uses a file `.gitmeta` to store/restore permissions and uid/gid
2929
info for all files/dirs tracked by git in the repository.
3030

0 commit comments

Comments
 (0)