@matheusbsbs / matheus-bagliano / commits / 82e5a82fd7
Fork 0

Fix more typos, primarily in the code

The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Pavel Roskin committed Jul 10, 2006 at 01:50 UTC 82e5a82fd73edb80a841f5fab1660e14b9b8f3ad
34 files changed +56 -56
Documentation/git-name-rev.txt
+1 -1
@@ -26,7 +26,7 @@ OPTIONS
26 List all commits reachable from all refs
27
28 --stdin::
29 - Read from stdin, append "(<rev_name>)" to all sha1's of name'able
29 + Read from stdin, append "(<rev_name>)" to all sha1's of nameable
30 commits, and pass to stdout
31
32 EXAMPLE
blame.c
+10 -10
@@ -21,11 +21,11 @@
21 #define DEBUG 0
22
23 static const char blame_usage[] = "[-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n"
24 - " -c, --compability Use the same output mode as git-annotate (Default: off)\n"
25 - " -l, --long Show long commit SHA1 (Default: off)\n"
26 - " -t, --time Show raw timestamp (Default: off)\n"
27 - " -S, --revs-file Use revisions from revs-file instead of calling git-rev-list\n"
28 - " -h, --help This message";
24 + " -c, --compatibility Use the same output mode as git-annotate (Default: off)\n"
25 + " -l, --long Show long commit SHA1 (Default: off)\n"
26 + " -t, --time Show raw timestamp (Default: off)\n"
27 + " -S, --revs-file Use revisions from revs-file instead of calling git-rev-list\n"
28 + " -h, --help This message";
29
30 static struct commit **blame_lines;
31 static int num_blame_lines;
@@ -747,7 +747,7 @@ int main(int argc, const char **argv)
747 const char *filename = NULL, *commit = NULL;
748 char filename_buf[256];
749 int sha1_len = 8;
750 - int compability = 0;
750 + int compatibility = 0;
751 int show_raw_time = 0;
752 int options = 1;
753 struct commit* start_commit;
@@ -774,8 +774,8 @@ int main(int argc, const char **argv)
774 sha1_len = 40;
775 continue;
776 } else if(!strcmp(argv[i], "-c") ||
777 - !strcmp(argv[i], "--compability")) {
778 - compability = 1;
777 + !strcmp(argv[i], "--compatibility")) {
778 + compatibility = 1;
779 continue;
780 } else if(!strcmp(argv[i], "-t") ||
781 !strcmp(argv[i], "--time")) {
@@ -784,7 +784,7 @@ int main(int argc, const char **argv)
784 } else if(!strcmp(argv[i], "-S")) {
785 if (i + 1 < argc &&
786 !read_ancestry(argv[i + 1], &sha1_p)) {
787 - compability = 1;
787 + compatibility = 1;
788 i++;
789 continue;
790 }
@@ -884,7 +884,7 @@ int main(int argc, const char **argv)
884 u = c->util;
885 get_commit_info(c, &ci);
886 fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);
887 - if(compability) {
887 + if(compatibility) {
888 printf("\t(%10s\t%10s\t%d)", ci.author,
889 format_time(ci.author_time, ci.author_tz,
890 show_raw_time),
builtin-apply.c
+2 -2
@@ -765,7 +765,7 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
765 continue;
766
767 /*
768 - * Make sure we don't find any unconnected patch fragmants.
768 + * Make sure we don't find any unconnected patch fragments.
769 * That's a sign that we didn't find a header, and that a
770 * patch has become corrupted/broken up.
771 */
@@ -990,7 +990,7 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
990 * so one line can fit up to 13 groups that would decode
991 * to 52 bytes max. The length byte 'A'-'Z' corresponds
992 * to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
993 - * The end of binary is signalled with an empty line.
993 + * The end of binary is signaled with an empty line.
994 */
995 int llen, used;
996 struct fragment *fragment;
builtin-diff.c
+1 -1
@@ -176,7 +176,7 @@ static int builtin_diff_tree(struct rev_info *revs,
176 usage(builtin_diff_usage);
177
178 /* We saw two trees, ent[0] and ent[1].
179 - * if ent[1] is unintesting, they are swapped
179 + * if ent[1] is uninteresting, they are swapped
180 */
181 if (ent[1].item->flags & UNINTERESTING)
182 swap = 1;
builtin-grep.c
+1 -1
@@ -941,7 +941,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
941 * pattern, but then what follows it must be zero or more
942 * valid refs up to the -- (if exists), and then existing
943 * paths. If there is an explicit pattern, then the first
944 - * unrecocnized non option is the beginning of the refs list
944 + * unrecognized non option is the beginning of the refs list
945 * that continues up to the -- (if exists), and then paths.
946 */
947
builtin-help.c
+1 -1
@@ -12,7 +12,7 @@
12 static const char git_usage[] =
13 "Usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [--help] COMMAND [ ARGS ]";
14
15 -/* most gui terms set COLUMNS (although some don't export it) */
15 +/* most GUI terminals set COLUMNS (although some don't export it) */
16 static int term_columns(void)
17 {
18 char *col_string = getenv("COLUMNS");
builtin-push.c
+1 -1
@@ -104,7 +104,7 @@ static int get_remotes_uri(const char *repo, const char *uri[MAX_URI])
104 if (n < MAX_URI)
105 uri[n++] = strdup(s);
106 else
107 - error("more than %d URL's specified, ignoreing the rest", MAX_URI);
107 + error("more than %d URL's specified, ignoring the rest", MAX_URI);
108 }
109 else if (is_refspec && !has_explicit_refspec)
110 add_refspec(strdup(s));
builtin-rm.c
+1 -1
@@ -129,7 +129,7 @@ int cmd_rm(int argc, const char **argv, char **envp)
129 * workspace. If we fail to remove the first one, we
130 * abort the "git rm" (but once we've successfully removed
131 * any file at all, we'll go ahead and commit to it all:
132 - * by then we've already committed ourself and can't fail
132 + * by then we've already committed ourselves and can't fail
133 * in the middle)
134 */
135 if (force) {
combine-diff.c
+1 -1
@@ -320,7 +320,7 @@ static int give_context(struct sline *sline, unsigned long cnt, int num_parent)
320 unsigned long i;
321
322 /* Two groups of interesting lines may have a short gap of
323 - * unintersting lines. Connect such groups to give them a
323 + * uninteresting lines. Connect such groups to give them a
324 * bit of context.
325 *
326 * We first start from what the interesting() function says,
compat/subprocess.py
+3 -3
@@ -568,7 +568,7 @@ class Popen(object):
568 # Windows methods
569 #
570 def _get_handles(self, stdin, stdout, stderr):
571 - """Construct and return tupel with IO objects:
571 + """Construct and return tuple with IO objects:
572 p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
573 """
574 if stdin == None and stdout == None and stderr == None:
@@ -635,7 +635,7 @@ class Popen(object):
635
636
637 def _find_w9xpopen(self):
638 - """Find and return absolut path to w9xpopen.exe"""
638 + """Find and return absolute path to w9xpopen.exe"""
639 w9xpopen = os.path.join(os.path.dirname(GetModuleFileName(0)),
640 "w9xpopen.exe")
641 if not os.path.exists(w9xpopen):
@@ -812,7 +812,7 @@ class Popen(object):
812 # POSIX methods
813 #
814 def _get_handles(self, stdin, stdout, stderr):
815 - """Construct and return tupel with IO objects:
815 + """Construct and return tuple with IO objects:
816 p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
817 """
818 p2cread, p2cwrite = None, None
contrib/colordiff/colordiff.perl
+1 -1
@@ -110,7 +110,7 @@ foreach $config_file (@config_files) {
110 }
111 }
112
113 -# colordiff specfic options here. Need to pre-declare if using variables
113 +# colordiff specific options here. Need to pre-declare if using variables
114 GetOptions(
115 "no-banner" => sub { $show_banner = 0 },
116 "plain-text=s" => \&set_color,
diff-delta.c
+3 -3
@@ -148,7 +148,7 @@ struct delta_index * create_delta_index(const void *buf, unsigned long bufsize)
148 return NULL;
149
150 /* Determine index hash size. Note that indexing skips the
151 - first byte to allow for optimizing the rabin polynomial
151 + first byte to allow for optimizing the Rabin's polynomial
152 initialization in create_delta(). */
153 entries = (bufsize - 1) / RABIN_WINDOW;
154 hsize = entries / 4;
@@ -205,7 +205,7 @@ struct delta_index * create_delta_index(const void *buf, unsigned long bufsize)
205
206 /*
207 * Determine a limit on the number of entries in the same hash
208 - * bucket. This guard us against patological data sets causing
208 + * bucket. This guards us against pathological data sets causing
209 * really bad hash distribution with most entries in the same hash
210 * bucket that would bring us to O(m*n) computing costs (m and n
211 * corresponding to reference and target buffer sizes).
@@ -240,7 +240,7 @@ void free_delta_index(struct delta_index *index)
240
241 /*
242 * The maximum size for any opcode sequence, including the initial header
243 - * plus rabin window plus biggest copy.
243 + * plus Rabin window plus biggest copy.
244 */
245 #define MAX_OP_SIZE (5 + 5 + 1 + RABIN_WINDOW + 7)
246
fetch-clone.c
+2 -2
@@ -198,8 +198,8 @@ int receive_unpack_pack(int xd[2], const char *me, int quiet, int sideband)
198
199 /*
200 * A "binary msec" is a power-of-two-msec, aka 1/1024th of a second.
201 - * Keeing the time in that format means that "bytes / msecs" means
202 - * is the same as kB/s (modulo rounding).
201 + * Keeping the time in that format means that "bytes / msecs" means
202 + * the same as kB/s (modulo rounding).
203 *
204 * 1000512 is a magic number (usecs in a second, rounded up by half
205 * of 1024, to make "rounding" come out right ;)
git-am.sh
+1 -1
@@ -77,7 +77,7 @@ fall_back_3way () {
77 # This is not so wrong. Depending on which base we picked,
78 # orig_tree may be wildly different from ours, but his_tree
79 # has the same set of wildly different changes in parts the
80 - # patch did not touch, so resolve ends up cancelling them,
80 + # patch did not touch, so resolve ends up canceling them,
81 # saying that we reverted all those changes.
82
83 git-merge-resolve $orig_tree -- HEAD $his_tree || {
git-applypatch.sh
+1 -1
@@ -182,7 +182,7 @@ git-apply --index "$PATCHFILE" || {
182 # This is not so wrong. Depending on which base we picked,
183 # orig_tree may be wildly different from ours, but his_tree
184 # has the same set of wildly different changes in parts the
185 - # patch did not touch, so resolve ends up cancelling them,
185 + # patch did not touch, so resolve ends up canceling them,
186 # saying that we reverted all those changes.
187
188 if git-merge-resolve $orig_tree -- HEAD $his_tree
git-archimport.perl
+4 -4
@@ -14,7 +14,7 @@
14
15 Imports a project from one or more Arch repositories. It will follow branches
16 and repositories within the namespaces defined by the <archive/branch>
17 -parameters suppplied. If it cannot find the remote branch a merge comes from
17 +parameters supplied. If it cannot find the remote branch a merge comes from
18 it will just import it as a regular commit. If it can find it, it will mark it
19 as a merge whenever possible.
20
@@ -88,7 +88,7 @@ usage if $opt_h;
88 # $arch_branches:
89 # values associated with keys:
90 # =1 - Arch version / git 'branch' detected via abrowse on a limit
91 -# >1 - Arch version / git 'branch' of an auxilliary branch we've merged
91 +# >1 - Arch version / git 'branch' of an auxiliary branch we've merged
92 my %arch_branches = map { $_ => 1 } @ARGV;
93
94 $ENV{'TMPDIR'} = $opt_t if $opt_t; # $ENV{TMPDIR} will affect tempdir() calls:
@@ -667,7 +667,7 @@ sub apply_cset {
667 if (`find $tmp/changeset/patches -type f -name '*.patch'`) {
668 # this can be sped up considerably by doing
669 # (find | xargs cat) | patch
670 - # but that cna get mucked up by patches
670 + # but that can get mucked up by patches
671 # with missing trailing newlines or the standard
672 # 'missing newline' flag in the patch - possibly
673 # produced with an old/buggy diff.
@@ -1026,7 +1026,7 @@ sub commitid2pset {
1026 }
1027
1028
1029 -# an alterative to `command` that allows input to be passed as an array
1029 +# an alternative to `command` that allows input to be passed as an array
1030 # to work around shell problems with weird characters in arguments
1031 sub safe_pipe_capture {
1032 my @output;
git-commit.sh
+1 -1
@@ -599,7 +599,7 @@ then
599 GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.*\(<.*\)'` &&
600 test '' != "$GIT_AUTHOR_NAME" &&
601 test '' != "$GIT_AUTHOR_EMAIL" ||
602 - die "malformatted --author parameter"
602 + die "malformed --author parameter"
603 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
604 elif test '' != "$use_commit"
605 then
git-cvsexportcommit.perl
+2 -2
@@ -179,7 +179,7 @@ my @bfiles = grep(m/^Binary/, safe_pipe_capture('git-diff-tree', '-p', $parent,
179 @bfiles = map { chomp } @bfiles;
180 foreach my $f (@bfiles) {
181 # check that the file in cvs matches the "old" file
182 - # extract the file to $tmpdir and comparre with cmp
182 + # extract the file to $tmpdir and compare with cmp
183 my $tree = safe_pipe_capture('git-rev-parse', "$parent^{tree}");
184 chomp $tree;
185 my $blob = `git-ls-tree $tree "$f" | cut -f 1 | cut -d ' ' -f 3`;
@@ -273,7 +273,7 @@ sub cleanupcvs {
273 }
274 }
275
276 -# An alterative to `command` that allows input to be passed as an array
276 +# An alternative to `command` that allows input to be passed as an array
277 # to work around shell problems with weird characters in arguments
278 # if the exec returns non-zero we die
279 sub safe_pipe_capture {
git-instaweb.sh
+1 -1
@@ -25,7 +25,7 @@ conf=$GIT_DIR/gitweb/httpd.conf
25
26 # Defaults:
27
28 -# if installed, it doens't need further configuration (module_path)
28 +# if installed, it doesn't need further configuration (module_path)
29 test -z "$httpd" && httpd='lighttpd -f'
30
31 # probably the most popular browser among gitweb users
git-merge-one-file.sh
+1 -1
@@ -8,7 +8,7 @@
8 # $2 - file in branch1 SHA1 (or empty)
9 # $3 - file in branch2 SHA1 (or empty)
10 # $4 - pathname in repository
11 -# $5 - orignal file mode (or empty)
11 +# $5 - original file mode (or empty)
12 # $6 - file in branch1 mode (or empty)
13 # $7 - file in branch2 mode (or empty)
14 #
git-merge-recursive.py
+1 -1
@@ -47,7 +47,7 @@ cacheOnly = False
47
48 def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0, ancestor=None):
49 '''Merge the commits h1 and h2, return the resulting virtual
50 - commit object and a flag indicating the cleaness of the merge.'''
50 + commit object and a flag indicating the cleanness of the merge.'''
51 assert(isinstance(h1, Commit) and isinstance(h2, Commit))
52
53 global outputIndent
git-push.sh
+1 -1
@@ -63,7 +63,7 @@ esac
63 shift ;# away the initial 'x'
64
65 # $# is now 0 if there was no explicit refspec on the command line
66 -# and there was no defalt refspec to push from remotes/ file.
66 +# and there was no default refspec to push from remotes/ file.
67 # we will let git-send-pack to do its "matching refs" thing.
68
69 case "$remote" in
git-quiltimport.sh
+1 -1
@@ -49,7 +49,7 @@ if [ -n "$quilt_author" ] ; then
49 quilt_author_email=$(expr "z$quilt_author" : '.*<\([^>]*\)') &&
50 test '' != "$quilt_author_name" &&
51 test '' != "$quilt_author_email" ||
52 - die "malformatted --author parameter"
52 + die "malformed --author parameter"
53 fi
54
55 # Quilt patch directory
git-send-email.perl
+1 -1
@@ -361,7 +361,7 @@ Options:
361 --smtp-server If set, specifies the outgoing SMTP server to use.
362 Defaults to localhost.
363
364 - --suppress-from Supress sending emails to yourself if your address
364 + --suppress-from Suppress sending emails to yourself if your address
365 appears in a From: line.
366
367 --quiet Make git-send-email less verbose. One line per email should be
git-svn.perl
+1 -1
@@ -2429,7 +2429,7 @@ sub extract_metadata {
2429 \s([a-f\d\-]+)$/x);
2430 if (!$rev || !$uuid || !$url) {
2431 # some of the original repositories I made had
2432 - # indentifiers like this:
2432 + # identifiers like this:
2433 ($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
2434 }
2435 return ($url, $rev, $uuid);
name-rev.c
+1 -1
@@ -5,7 +5,7 @@
5 #include "refs.h"
6
7 static const char name_rev_usage[] =
8 - "git-name-rev [--tags] ( --all | --stdin | commitish [commitish...] )\n";
8 + "git-name-rev [--tags] ( --all | --stdin | committish [committish...] )\n";
9
10 typedef struct rev_name {
11 const char *tip_name;
pack-objects.c
+2 -2
@@ -28,7 +28,7 @@ struct object_entry {
28 struct object_entry *delta; /* delta base object */
29 struct packed_git *in_pack; /* already in pack */
30 unsigned int in_pack_offset;
31 - struct object_entry *delta_child; /* delitified objects who bases me */
31 + struct object_entry *delta_child; /* deltified objects who bases me */
32 struct object_entry *delta_sibling; /* other deltified objects who
33 * uses the same base as me
34 */
@@ -39,7 +39,7 @@ struct object_entry {
39 };
40
41 /*
42 - * Objects we are going to pack are colected in objects array (dynamically
42 + * Objects we are going to pack are collected in objects array (dynamically
43 * expanded). nr_objects & nr_alloc controls this array. They are stored
44 * in the order we see -- typically rev-list --objects order that gives us
45 * nice "minimum seek" order.
ppc/sha1ppc.S
+1 -1
@@ -62,7 +62,7 @@
62 * computation of W[t+4].
63 *
64 * The first 16 rounds use W values loaded directly from memory, while the
65 - * remianing 64 use values computed from those first 16. We preload
65 + * remaining 64 use values computed from those first 16. We preload
66 * 4 values before starting, so there are three kinds of rounds:
67 * - The first 12 (all f0) also load the W values from memory.
68 * - The next 64 compute W(i+4) in parallel. 8*f0, 20*f1, 20*f2, 16*f1.
sha1_file.c
+1 -1
@@ -1660,7 +1660,7 @@ int has_sha1_file(const unsigned char *sha1)
1660
1661 /*
1662 * reads from fd as long as possible into a supplied buffer of size bytes.
1663 - * If neccessary the buffer's size is increased using realloc()
1663 + * If necessary the buffer's size is increased using realloc()
1664 *
1665 * returns 0 if anything went fine and -1 otherwise
1666 *
t/t5700-clone-reference.sh
+1 -1
@@ -31,7 +31,7 @@ test_expect_success 'cloning with reference' \
31
32 cd "$base_dir"
33
34 -test_expect_success 'existance of info/alternates' \
34 +test_expect_success 'existence of info/alternates' \
35 'test `wc -l <C/.git/objects/info/alternates` = 2'
36
37 cd "$base_dir"
t/t5710-info-alternate.sh
+1 -1
@@ -81,7 +81,7 @@ test_valid_repo"
81
82 cd "$base_dir"
83
84 -test_expect_failure 'that info/alternates is neccessary' \
84 +test_expect_failure 'that info/alternates is necessary' \
85 'cd C &&
86 rm .git/objects/info/alternates &&
87 test_valid_repo'
t/t6002-rev-list-bisect.sh
+1 -1
@@ -154,7 +154,7 @@ test_sequence()
154 test_bisection_diff 0 $_bisect_option u5 ^U
155
156 #
157 -# the following illustrate's Linus' binary bug blatt idea.
157 +# the following illustrates Linus' binary bug blatt idea.
158 #
159 # assume the bug is actually at l3, but you don't know that - all you know is that l3 is broken
160 # and it wasn't broken before
t/t6021-merge-criss-cross.sh
+1 -1
@@ -4,7 +4,7 @@
4 #
5
6 # See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a
7 -# nice decription of what this is about.
7 +# nice description of what this is about.
8
9
10 test_description='Test criss-cross merge'
xdiff/xdiffi.c
+3 -3
@@ -84,7 +84,7 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
84 * We need to extent the diagonal "domain" by one. If the next
85 * values exits the box boundaries we need to change it in the
86 * opposite direction because (max - min) must be a power of two.
87 - * Also we initialize the extenal K value to -1 so that we can
87 + * Also we initialize the external K value to -1 so that we can
88 * avoid extra conditions check inside the core loop.
89 */
90 if (fmin > dmin)
@@ -119,7 +119,7 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
119 * We need to extent the diagonal "domain" by one. If the next
120 * values exits the box boundaries we need to change it in the
121 * opposite direction because (max - min) must be a power of two.
122 - * Also we initialize the extenal K value to -1 so that we can
122 + * Also we initialize the external K value to -1 so that we can
123 * avoid extra conditions check inside the core loop.
124 */
125 if (bmin > dmin)
@@ -405,7 +405,7 @@ static int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
405 /*
406 * This is the same of what GNU diff does. Move back and forward
407 * change groups for a consistent and pretty diff output. This also
408 - * helps in finding joineable change groups and reduce the diff size.
408 + * helps in finding joinable change groups and reduce the diff size.
409 */
410 for (ix = ixo = 0;;) {
411 /*