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>
This commit is contained in:
Pavel Roskin
Junio C Hamano
parent
930cf7dd7c
commit
82e5a82fd7
@ -26,7 +26,7 @@ OPTIONS
|
||||
List all commits reachable from all refs
|
||||
|
||||
--stdin::
|
||||
Read from stdin, append "(<rev_name>)" to all sha1's of name'able
|
||||
Read from stdin, append "(<rev_name>)" to all sha1's of nameable
|
||||
commits, and pass to stdout
|
||||
|
||||
EXAMPLE
|
||||
|
||||
12
blame.c
12
blame.c
@ -21,7 +21,7 @@
|
||||
#define DEBUG 0
|
||||
|
||||
static const char blame_usage[] = "[-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\n"
|
||||
" -c, --compability Use the same output mode as git-annotate (Default: off)\n"
|
||||
" -c, --compatibility Use the same output mode as git-annotate (Default: off)\n"
|
||||
" -l, --long Show long commit SHA1 (Default: off)\n"
|
||||
" -t, --time Show raw timestamp (Default: off)\n"
|
||||
" -S, --revs-file Use revisions from revs-file instead of calling git-rev-list\n"
|
||||
@ -747,7 +747,7 @@ int main(int argc, const char **argv)
|
||||
const char *filename = NULL, *commit = NULL;
|
||||
char filename_buf[256];
|
||||
int sha1_len = 8;
|
||||
int compability = 0;
|
||||
int compatibility = 0;
|
||||
int show_raw_time = 0;
|
||||
int options = 1;
|
||||
struct commit* start_commit;
|
||||
@ -774,8 +774,8 @@ int main(int argc, const char **argv)
|
||||
sha1_len = 40;
|
||||
continue;
|
||||
} else if(!strcmp(argv[i], "-c") ||
|
||||
!strcmp(argv[i], "--compability")) {
|
||||
compability = 1;
|
||||
!strcmp(argv[i], "--compatibility")) {
|
||||
compatibility = 1;
|
||||
continue;
|
||||
} else if(!strcmp(argv[i], "-t") ||
|
||||
!strcmp(argv[i], "--time")) {
|
||||
@ -784,7 +784,7 @@ int main(int argc, const char **argv)
|
||||
} else if(!strcmp(argv[i], "-S")) {
|
||||
if (i + 1 < argc &&
|
||||
!read_ancestry(argv[i + 1], &sha1_p)) {
|
||||
compability = 1;
|
||||
compatibility = 1;
|
||||
i++;
|
||||
continue;
|
||||
}
|
||||
@ -884,7 +884,7 @@ int main(int argc, const char **argv)
|
||||
u = c->util;
|
||||
get_commit_info(c, &ci);
|
||||
fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);
|
||||
if(compability) {
|
||||
if(compatibility) {
|
||||
printf("\t(%10s\t%10s\t%d)", ci.author,
|
||||
format_time(ci.author_time, ci.author_tz,
|
||||
show_raw_time),
|
||||
|
||||
@ -765,7 +765,7 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
|
||||
continue;
|
||||
|
||||
/*
|
||||
* Make sure we don't find any unconnected patch fragmants.
|
||||
* Make sure we don't find any unconnected patch fragments.
|
||||
* That's a sign that we didn't find a header, and that a
|
||||
* patch has become corrupted/broken up.
|
||||
*/
|
||||
@ -990,7 +990,7 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch)
|
||||
* so one line can fit up to 13 groups that would decode
|
||||
* to 52 bytes max. The length byte 'A'-'Z' corresponds
|
||||
* to 1-26 bytes, and 'a'-'z' corresponds to 27-52 bytes.
|
||||
* The end of binary is signalled with an empty line.
|
||||
* The end of binary is signaled with an empty line.
|
||||
*/
|
||||
int llen, used;
|
||||
struct fragment *fragment;
|
||||
|
||||
@ -176,7 +176,7 @@ static int builtin_diff_tree(struct rev_info *revs,
|
||||
usage(builtin_diff_usage);
|
||||
|
||||
/* We saw two trees, ent[0] and ent[1].
|
||||
* if ent[1] is unintesting, they are swapped
|
||||
* if ent[1] is uninteresting, they are swapped
|
||||
*/
|
||||
if (ent[1].item->flags & UNINTERESTING)
|
||||
swap = 1;
|
||||
|
||||
@ -941,7 +941,7 @@ int cmd_grep(int argc, const char **argv, char **envp)
|
||||
* pattern, but then what follows it must be zero or more
|
||||
* valid refs up to the -- (if exists), and then existing
|
||||
* paths. If there is an explicit pattern, then the first
|
||||
* unrecocnized non option is the beginning of the refs list
|
||||
* unrecognized non option is the beginning of the refs list
|
||||
* that continues up to the -- (if exists), and then paths.
|
||||
*/
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
static const char git_usage[] =
|
||||
"Usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [--help] COMMAND [ ARGS ]";
|
||||
|
||||
/* most gui terms set COLUMNS (although some don't export it) */
|
||||
/* most GUI terminals set COLUMNS (although some don't export it) */
|
||||
static int term_columns(void)
|
||||
{
|
||||
char *col_string = getenv("COLUMNS");
|
||||
|
||||
@ -104,7 +104,7 @@ static int get_remotes_uri(const char *repo, const char *uri[MAX_URI])
|
||||
if (n < MAX_URI)
|
||||
uri[n++] = strdup(s);
|
||||
else
|
||||
error("more than %d URL's specified, ignoreing the rest", MAX_URI);
|
||||
error("more than %d URL's specified, ignoring the rest", MAX_URI);
|
||||
}
|
||||
else if (is_refspec && !has_explicit_refspec)
|
||||
add_refspec(strdup(s));
|
||||
|
||||
@ -129,7 +129,7 @@ int cmd_rm(int argc, const char **argv, char **envp)
|
||||
* workspace. If we fail to remove the first one, we
|
||||
* abort the "git rm" (but once we've successfully removed
|
||||
* any file at all, we'll go ahead and commit to it all:
|
||||
* by then we've already committed ourself and can't fail
|
||||
* by then we've already committed ourselves and can't fail
|
||||
* in the middle)
|
||||
*/
|
||||
if (force) {
|
||||
|
||||
@ -320,7 +320,7 @@ static int give_context(struct sline *sline, unsigned long cnt, int num_parent)
|
||||
unsigned long i;
|
||||
|
||||
/* Two groups of interesting lines may have a short gap of
|
||||
* unintersting lines. Connect such groups to give them a
|
||||
* uninteresting lines. Connect such groups to give them a
|
||||
* bit of context.
|
||||
*
|
||||
* We first start from what the interesting() function says,
|
||||
|
||||
@ -568,7 +568,7 @@ class Popen(object):
|
||||
# Windows methods
|
||||
#
|
||||
def _get_handles(self, stdin, stdout, stderr):
|
||||
"""Construct and return tupel with IO objects:
|
||||
"""Construct and return tuple with IO objects:
|
||||
p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
|
||||
"""
|
||||
if stdin == None and stdout == None and stderr == None:
|
||||
@ -635,7 +635,7 @@ class Popen(object):
|
||||
|
||||
|
||||
def _find_w9xpopen(self):
|
||||
"""Find and return absolut path to w9xpopen.exe"""
|
||||
"""Find and return absolute path to w9xpopen.exe"""
|
||||
w9xpopen = os.path.join(os.path.dirname(GetModuleFileName(0)),
|
||||
"w9xpopen.exe")
|
||||
if not os.path.exists(w9xpopen):
|
||||
@ -812,7 +812,7 @@ class Popen(object):
|
||||
# POSIX methods
|
||||
#
|
||||
def _get_handles(self, stdin, stdout, stderr):
|
||||
"""Construct and return tupel with IO objects:
|
||||
"""Construct and return tuple with IO objects:
|
||||
p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
|
||||
"""
|
||||
p2cread, p2cwrite = None, None
|
||||
|
||||
@ -110,7 +110,7 @@ foreach $config_file (@config_files) {
|
||||
}
|
||||
}
|
||||
|
||||
# colordiff specfic options here. Need to pre-declare if using variables
|
||||
# colordiff specific options here. Need to pre-declare if using variables
|
||||
GetOptions(
|
||||
"no-banner" => sub { $show_banner = 0 },
|
||||
"plain-text=s" => \&set_color,
|
||||
|
||||
@ -148,7 +148,7 @@ struct delta_index * create_delta_index(const void *buf, unsigned long bufsize)
|
||||
return NULL;
|
||||
|
||||
/* Determine index hash size. Note that indexing skips the
|
||||
first byte to allow for optimizing the rabin polynomial
|
||||
first byte to allow for optimizing the Rabin's polynomial
|
||||
initialization in create_delta(). */
|
||||
entries = (bufsize - 1) / RABIN_WINDOW;
|
||||
hsize = entries / 4;
|
||||
@ -205,7 +205,7 @@ struct delta_index * create_delta_index(const void *buf, unsigned long bufsize)
|
||||
|
||||
/*
|
||||
* Determine a limit on the number of entries in the same hash
|
||||
* bucket. This guard us against patological data sets causing
|
||||
* bucket. This guards us against pathological data sets causing
|
||||
* really bad hash distribution with most entries in the same hash
|
||||
* bucket that would bring us to O(m*n) computing costs (m and n
|
||||
* corresponding to reference and target buffer sizes).
|
||||
@ -240,7 +240,7 @@ void free_delta_index(struct delta_index *index)
|
||||
|
||||
/*
|
||||
* The maximum size for any opcode sequence, including the initial header
|
||||
* plus rabin window plus biggest copy.
|
||||
* plus Rabin window plus biggest copy.
|
||||
*/
|
||||
#define MAX_OP_SIZE (5 + 5 + 1 + RABIN_WINDOW + 7)
|
||||
|
||||
|
||||
@ -198,8 +198,8 @@ int receive_unpack_pack(int xd[2], const char *me, int quiet, int sideband)
|
||||
|
||||
/*
|
||||
* A "binary msec" is a power-of-two-msec, aka 1/1024th of a second.
|
||||
* Keeing the time in that format means that "bytes / msecs" means
|
||||
* is the same as kB/s (modulo rounding).
|
||||
* Keeping the time in that format means that "bytes / msecs" means
|
||||
* the same as kB/s (modulo rounding).
|
||||
*
|
||||
* 1000512 is a magic number (usecs in a second, rounded up by half
|
||||
* of 1024, to make "rounding" come out right ;)
|
||||
|
||||
@ -77,7 +77,7 @@ fall_back_3way () {
|
||||
# This is not so wrong. Depending on which base we picked,
|
||||
# orig_tree may be wildly different from ours, but his_tree
|
||||
# has the same set of wildly different changes in parts the
|
||||
# patch did not touch, so resolve ends up cancelling them,
|
||||
# patch did not touch, so resolve ends up canceling them,
|
||||
# saying that we reverted all those changes.
|
||||
|
||||
git-merge-resolve $orig_tree -- HEAD $his_tree || {
|
||||
|
||||
@ -182,7 +182,7 @@ git-apply --index "$PATCHFILE" || {
|
||||
# This is not so wrong. Depending on which base we picked,
|
||||
# orig_tree may be wildly different from ours, but his_tree
|
||||
# has the same set of wildly different changes in parts the
|
||||
# patch did not touch, so resolve ends up cancelling them,
|
||||
# patch did not touch, so resolve ends up canceling them,
|
||||
# saying that we reverted all those changes.
|
||||
|
||||
if git-merge-resolve $orig_tree -- HEAD $his_tree
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
Imports a project from one or more Arch repositories. It will follow branches
|
||||
and repositories within the namespaces defined by the <archive/branch>
|
||||
parameters suppplied. If it cannot find the remote branch a merge comes from
|
||||
parameters supplied. If it cannot find the remote branch a merge comes from
|
||||
it will just import it as a regular commit. If it can find it, it will mark it
|
||||
as a merge whenever possible.
|
||||
|
||||
@ -88,7 +88,7 @@ usage if $opt_h;
|
||||
# $arch_branches:
|
||||
# values associated with keys:
|
||||
# =1 - Arch version / git 'branch' detected via abrowse on a limit
|
||||
# >1 - Arch version / git 'branch' of an auxilliary branch we've merged
|
||||
# >1 - Arch version / git 'branch' of an auxiliary branch we've merged
|
||||
my %arch_branches = map { $_ => 1 } @ARGV;
|
||||
|
||||
$ENV{'TMPDIR'} = $opt_t if $opt_t; # $ENV{TMPDIR} will affect tempdir() calls:
|
||||
@ -667,7 +667,7 @@ sub apply_cset {
|
||||
if (`find $tmp/changeset/patches -type f -name '*.patch'`) {
|
||||
# this can be sped up considerably by doing
|
||||
# (find | xargs cat) | patch
|
||||
# but that cna get mucked up by patches
|
||||
# but that can get mucked up by patches
|
||||
# with missing trailing newlines or the standard
|
||||
# 'missing newline' flag in the patch - possibly
|
||||
# produced with an old/buggy diff.
|
||||
@ -1026,7 +1026,7 @@ sub commitid2pset {
|
||||
}
|
||||
|
||||
|
||||
# an alterative to `command` that allows input to be passed as an array
|
||||
# an alternative to `command` that allows input to be passed as an array
|
||||
# to work around shell problems with weird characters in arguments
|
||||
sub safe_pipe_capture {
|
||||
my @output;
|
||||
|
||||
@ -599,7 +599,7 @@ then
|
||||
GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.*\(<.*\)'` &&
|
||||
test '' != "$GIT_AUTHOR_NAME" &&
|
||||
test '' != "$GIT_AUTHOR_EMAIL" ||
|
||||
die "malformatted --author parameter"
|
||||
die "malformed --author parameter"
|
||||
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
|
||||
elif test '' != "$use_commit"
|
||||
then
|
||||
|
||||
@ -179,7 +179,7 @@ my @bfiles = grep(m/^Binary/, safe_pipe_capture('git-diff-tree', '-p', $parent,
|
||||
@bfiles = map { chomp } @bfiles;
|
||||
foreach my $f (@bfiles) {
|
||||
# check that the file in cvs matches the "old" file
|
||||
# extract the file to $tmpdir and comparre with cmp
|
||||
# extract the file to $tmpdir and compare with cmp
|
||||
my $tree = safe_pipe_capture('git-rev-parse', "$parent^{tree}");
|
||||
chomp $tree;
|
||||
my $blob = `git-ls-tree $tree "$f" | cut -f 1 | cut -d ' ' -f 3`;
|
||||
@ -273,7 +273,7 @@ sub cleanupcvs {
|
||||
}
|
||||
}
|
||||
|
||||
# An alterative to `command` that allows input to be passed as an array
|
||||
# An alternative to `command` that allows input to be passed as an array
|
||||
# to work around shell problems with weird characters in arguments
|
||||
# if the exec returns non-zero we die
|
||||
sub safe_pipe_capture {
|
||||
|
||||
@ -25,7 +25,7 @@ conf=$GIT_DIR/gitweb/httpd.conf
|
||||
|
||||
# Defaults:
|
||||
|
||||
# if installed, it doens't need further configuration (module_path)
|
||||
# if installed, it doesn't need further configuration (module_path)
|
||||
test -z "$httpd" && httpd='lighttpd -f'
|
||||
|
||||
# probably the most popular browser among gitweb users
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
# $2 - file in branch1 SHA1 (or empty)
|
||||
# $3 - file in branch2 SHA1 (or empty)
|
||||
# $4 - pathname in repository
|
||||
# $5 - orignal file mode (or empty)
|
||||
# $5 - original file mode (or empty)
|
||||
# $6 - file in branch1 mode (or empty)
|
||||
# $7 - file in branch2 mode (or empty)
|
||||
#
|
||||
|
||||
@ -47,7 +47,7 @@ cacheOnly = False
|
||||
|
||||
def merge(h1, h2, branch1Name, branch2Name, graph, callDepth=0, ancestor=None):
|
||||
'''Merge the commits h1 and h2, return the resulting virtual
|
||||
commit object and a flag indicating the cleaness of the merge.'''
|
||||
commit object and a flag indicating the cleanness of the merge.'''
|
||||
assert(isinstance(h1, Commit) and isinstance(h2, Commit))
|
||||
|
||||
global outputIndent
|
||||
|
||||
@ -63,7 +63,7 @@ esac
|
||||
shift ;# away the initial 'x'
|
||||
|
||||
# $# is now 0 if there was no explicit refspec on the command line
|
||||
# and there was no defalt refspec to push from remotes/ file.
|
||||
# and there was no default refspec to push from remotes/ file.
|
||||
# we will let git-send-pack to do its "matching refs" thing.
|
||||
|
||||
case "$remote" in
|
||||
|
||||
@ -49,7 +49,7 @@ if [ -n "$quilt_author" ] ; then
|
||||
quilt_author_email=$(expr "z$quilt_author" : '.*<\([^>]*\)') &&
|
||||
test '' != "$quilt_author_name" &&
|
||||
test '' != "$quilt_author_email" ||
|
||||
die "malformatted --author parameter"
|
||||
die "malformed --author parameter"
|
||||
fi
|
||||
|
||||
# Quilt patch directory
|
||||
|
||||
@ -361,7 +361,7 @@ Options:
|
||||
--smtp-server If set, specifies the outgoing SMTP server to use.
|
||||
Defaults to localhost.
|
||||
|
||||
--suppress-from Supress sending emails to yourself if your address
|
||||
--suppress-from Suppress sending emails to yourself if your address
|
||||
appears in a From: line.
|
||||
|
||||
--quiet Make git-send-email less verbose. One line per email should be
|
||||
|
||||
@ -2429,7 +2429,7 @@ sub extract_metadata {
|
||||
\s([a-f\d\-]+)$/x);
|
||||
if (!$rev || !$uuid || !$url) {
|
||||
# some of the original repositories I made had
|
||||
# indentifiers like this:
|
||||
# identifiers like this:
|
||||
($rev, $uuid) = ($id =~/^git-svn-id:\s(\d+)\@([a-f\d\-]+)/);
|
||||
}
|
||||
return ($url, $rev, $uuid);
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
#include "refs.h"
|
||||
|
||||
static const char name_rev_usage[] =
|
||||
"git-name-rev [--tags] ( --all | --stdin | commitish [commitish...] )\n";
|
||||
"git-name-rev [--tags] ( --all | --stdin | committish [committish...] )\n";
|
||||
|
||||
typedef struct rev_name {
|
||||
const char *tip_name;
|
||||
|
||||
@ -28,7 +28,7 @@ struct object_entry {
|
||||
struct object_entry *delta; /* delta base object */
|
||||
struct packed_git *in_pack; /* already in pack */
|
||||
unsigned int in_pack_offset;
|
||||
struct object_entry *delta_child; /* delitified objects who bases me */
|
||||
struct object_entry *delta_child; /* deltified objects who bases me */
|
||||
struct object_entry *delta_sibling; /* other deltified objects who
|
||||
* uses the same base as me
|
||||
*/
|
||||
@ -39,7 +39,7 @@ struct object_entry {
|
||||
};
|
||||
|
||||
/*
|
||||
* Objects we are going to pack are colected in objects array (dynamically
|
||||
* Objects we are going to pack are collected in objects array (dynamically
|
||||
* expanded). nr_objects & nr_alloc controls this array. They are stored
|
||||
* in the order we see -- typically rev-list --objects order that gives us
|
||||
* nice "minimum seek" order.
|
||||
|
||||
@ -62,7 +62,7 @@
|
||||
* computation of W[t+4].
|
||||
*
|
||||
* The first 16 rounds use W values loaded directly from memory, while the
|
||||
* remianing 64 use values computed from those first 16. We preload
|
||||
* remaining 64 use values computed from those first 16. We preload
|
||||
* 4 values before starting, so there are three kinds of rounds:
|
||||
* - The first 12 (all f0) also load the W values from memory.
|
||||
* - The next 64 compute W(i+4) in parallel. 8*f0, 20*f1, 20*f2, 16*f1.
|
||||
|
||||
@ -1660,7 +1660,7 @@ int has_sha1_file(const unsigned char *sha1)
|
||||
|
||||
/*
|
||||
* reads from fd as long as possible into a supplied buffer of size bytes.
|
||||
* If neccessary the buffer's size is increased using realloc()
|
||||
* If necessary the buffer's size is increased using realloc()
|
||||
*
|
||||
* returns 0 if anything went fine and -1 otherwise
|
||||
*
|
||||
|
||||
@ -31,7 +31,7 @@ test_expect_success 'cloning with reference' \
|
||||
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_success 'existance of info/alternates' \
|
||||
test_expect_success 'existence of info/alternates' \
|
||||
'test `wc -l <C/.git/objects/info/alternates` = 2'
|
||||
|
||||
cd "$base_dir"
|
||||
|
||||
@ -81,7 +81,7 @@ test_valid_repo"
|
||||
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_failure 'that info/alternates is neccessary' \
|
||||
test_expect_failure 'that info/alternates is necessary' \
|
||||
'cd C &&
|
||||
rm .git/objects/info/alternates &&
|
||||
test_valid_repo'
|
||||
|
||||
@ -154,7 +154,7 @@ test_sequence()
|
||||
test_bisection_diff 0 $_bisect_option u5 ^U
|
||||
|
||||
#
|
||||
# the following illustrate's Linus' binary bug blatt idea.
|
||||
# the following illustrates Linus' binary bug blatt idea.
|
||||
#
|
||||
# assume the bug is actually at l3, but you don't know that - all you know is that l3 is broken
|
||||
# and it wasn't broken before
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
|
||||
# See http://marc.theaimsgroup.com/?l=git&m=111463358500362&w=2 for a
|
||||
# nice decription of what this is about.
|
||||
# nice description of what this is about.
|
||||
|
||||
|
||||
test_description='Test criss-cross merge'
|
||||
|
||||
@ -84,7 +84,7 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
|
||||
* We need to extent the diagonal "domain" by one. If the next
|
||||
* values exits the box boundaries we need to change it in the
|
||||
* opposite direction because (max - min) must be a power of two.
|
||||
* Also we initialize the extenal K value to -1 so that we can
|
||||
* Also we initialize the external K value to -1 so that we can
|
||||
* avoid extra conditions check inside the core loop.
|
||||
*/
|
||||
if (fmin > dmin)
|
||||
@ -119,7 +119,7 @@ static long xdl_split(unsigned long const *ha1, long off1, long lim1,
|
||||
* We need to extent the diagonal "domain" by one. If the next
|
||||
* values exits the box boundaries we need to change it in the
|
||||
* opposite direction because (max - min) must be a power of two.
|
||||
* Also we initialize the extenal K value to -1 so that we can
|
||||
* Also we initialize the external K value to -1 so that we can
|
||||
* avoid extra conditions check inside the core loop.
|
||||
*/
|
||||
if (bmin > dmin)
|
||||
@ -405,7 +405,7 @@ static int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
|
||||
/*
|
||||
* This is the same of what GNU diff does. Move back and forward
|
||||
* change groups for a consistent and pretty diff output. This also
|
||||
* helps in finding joineable change groups and reduce the diff size.
|
||||
* helps in finding joinable change groups and reduce the diff size.
|
||||
*/
|
||||
for (ix = ixo = 0;;) {
|
||||
/*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user