Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
3dff5379
G
git
项目概览
李少辉-开发者
/
git
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
git
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3dff5379
编写于
2月 03, 2007
作者:
P
Pavel Roskin
提交者:
Junio C Hamano
2月 03, 2007
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Assorted typo fixes
Signed-off-by:
N
Junio C Hamano
<
junkio@cox.net
>
上级
0f390875
变更
27
隐藏空白更改
内联
并排
Showing
27 changed file
with
41 addition
and
41 deletion
+41
-41
Documentation/config.txt
Documentation/config.txt
+1
-1
Documentation/diff-format.txt
Documentation/diff-format.txt
+1
-1
Documentation/git-send-pack.txt
Documentation/git-send-pack.txt
+1
-1
Documentation/git-svn.txt
Documentation/git-svn.txt
+1
-1
Documentation/gitk.txt
Documentation/gitk.txt
+1
-1
Documentation/user-manual.txt
Documentation/user-manual.txt
+5
-5
builtin-blame.c
builtin-blame.c
+3
-3
builtin-branch.c
builtin-branch.c
+1
-1
builtin-for-each-ref.c
builtin-for-each-ref.c
+1
-1
builtin-fsck.c
builtin-fsck.c
+1
-1
daemon.c
daemon.c
+1
-1
git-merge-resolve.sh
git-merge-resolve.sh
+1
-1
git-quiltimport.sh
git-quiltimport.sh
+1
-1
gitweb/gitweb.perl
gitweb/gitweb.perl
+1
-1
merge-recursive.c
merge-recursive.c
+4
-4
perl/Git.pm
perl/Git.pm
+1
-1
perl/private-Error.pm
perl/private-Error.pm
+1
-1
ppc/sha1ppc.S
ppc/sha1ppc.S
+3
-3
sha1_file.c
sha1_file.c
+1
-1
t/t1004-read-tree-m-u-wf.sh
t/t1004-read-tree-m-u-wf.sh
+1
-1
t/t1020-subdirectory.sh
t/t1020-subdirectory.sh
+3
-3
t/t3800-mktag.sh
t/t3800-mktag.sh
+2
-2
t/t5000-tar-tree.sh
t/t5000-tar-tree.sh
+1
-1
t/t5600-clone-fail-cleanup.sh
t/t5600-clone-fail-cleanup.sh
+1
-1
t/t9101-git-svn-props.sh
t/t9101-git-svn-props.sh
+1
-1
templates/Makefile
templates/Makefile
+1
-1
templates/hooks--update
templates/hooks--update
+1
-1
未找到文件。
Documentation/config.txt
浏览文件 @
3dff5379
...
...
@@ -39,7 +39,7 @@ in the section header, like in example below:
Subsection names can contain any characters except newline (doublequote
'`"`' and backslash have to be escaped as '`\"`' and '`\\`',
respec
it
vely) and are case sensitive. Section header cannot span multiple
respec
ti
vely) and are case sensitive. Section header cannot span multiple
lines. Variables may belong directly to a section or to a given subsection.
You can have `[section]` if you have `[section "subsection"]`, but you
don't need to.
...
...
Documentation/diff-format.txt
浏览文件 @
3dff5379
...
...
@@ -159,7 +159,7 @@ or like this (when '--cc' option is used):
deleted file mode <mode>,<mode>
+
The `mode <mode>,<mode>..<mode>` line appears only if at least one of
the <mode> is diferent from the rest. Extended headers with
the <mode> is dif
f
erent from the rest. Extended headers with
information about detected contents movement (renames and
copying detection) are designed to work with diff of two
<tree-ish> and are not used by combined diff format.
...
...
Documentation/git-send-pack.txt
浏览文件 @
3dff5379
...
...
@@ -3,7 +3,7 @@ git-send-pack(1)
NAME
----
git-send-pack - Push objects over git protocol to another reposi
o
tory
git-send-pack - Push objects over git protocol to another repository
SYNOPSIS
...
...
Documentation/git-svn.txt
浏览文件 @
3dff5379
...
...
@@ -133,7 +133,7 @@ manually joining branches on commit.
'multi-init'::
This command supports git-svnimport-like command-line syntax for
importing repositories that are la
ye
d out as recommended by the
importing repositories that are la
i
d out as recommended by the
SVN folks. This is a bit more tolerant than the git-svnimport
command-line syntax and doesn't require the user to figure out
where the repository URL ends and where the repository path
...
...
Documentation/gitk.txt
浏览文件 @
3dff5379
...
...
@@ -54,7 +54,7 @@ frequently used options.
Limit commits to the ones touching files in the given paths. Note, to
avoid ambiguity wrt. revision names use "--" to separate the paths
from any prece
e
ding options.
from any preceding options.
Examples
--------
...
...
Documentation/user-manual.txt
浏览文件 @
3dff5379
...
...
@@ -425,8 +425,8 @@ if commit X is an ancestor of commit Y. Equivalently, you could say
that Y is a descendent of X, or that there is a chain of parents
leading from commit Y to commit X.
Undestanding history: History diagrams
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Unde
r
standing history: History diagrams
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~
We will sometimes represent git history using diagrams like the one
below. Commits are shown as "o", and the links between them with
...
...
@@ -806,7 +806,7 @@ display options.
Note that git log starts with the most recent commit and works
backwards through the parents; however, since git history can contain
multiple independ
a
nt lines of development, the particular order that
multiple independ
e
nt lines of development, the particular order that
commits are listed in may be somewhat arbitrary.
Generating diffs
...
...
@@ -1075,7 +1075,7 @@ $ git commit
-------------------------------------------------
and git will prompt you for a commit message and then create the new
comm
m
it. Check to make sure it looks like what you expected with
commit. Check to make sure it looks like what you expected with
-------------------------------------------------
$ git show
...
...
@@ -2953,7 +2953,7 @@ Include cross-references to the glossary, where appropriate.
Document shallow clones? See draft 1.5.0 release notes for some
documentation.
Add a sectin on working with other version control systems, including
Add a secti
o
n on working with other version control systems, including
CVS, Subversion, and just imports of series of release tarballs.
More details on gitweb?
...
...
builtin-blame.c
浏览文件 @
3dff5379
...
...
@@ -550,7 +550,7 @@ static void free_patch(struct patch *p)
}
/*
* Link in a new blame entry to the scorebord. Entries that cover the
* Link in a new blame entry to the scorebo
a
rd. Entries that cover the
* same line range have been removed from the scoreboard previously.
*/
static
void
add_blame_entry
(
struct
scoreboard
*
sb
,
struct
blame_entry
*
e
)
...
...
@@ -1392,7 +1392,7 @@ static void found_guilty_entry(struct blame_entry *ent)
/*
* The main loop -- while the scoreboard has lines whose true origin
* is still unknown, pick one b
r
ame_entry, and allow its current
* is still unknown, pick one b
l
ame_entry, and allow its current
* suspect to pass blames to its parents.
*/
static
void
assign_blame
(
struct
scoreboard
*
sb
,
struct
rev_info
*
revs
,
int
opt
)
...
...
@@ -2001,7 +2001,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
/*
* We have collected options unknown to us in argv[1..unk]
* which are to be passed to revision machinery if we are
* going to do the "bottom" procesing.
* going to do the "bottom" proces
s
ing.
*
* The remaining are:
*
...
...
builtin-branch.c
浏览文件 @
3dff5379
...
...
@@ -364,7 +364,7 @@ static void rename_branch(const char *oldname, const char *newname, int force)
unsigned
char
sha1
[
20
];
if
(
!
oldname
)
die
(
"cannot rename the curren branch while not on any."
);
die
(
"cannot rename the curren
t
branch while not on any."
);
if
(
snprintf
(
oldref
,
sizeof
(
oldref
),
"refs/heads/%s"
,
oldname
)
>
sizeof
(
oldref
))
die
(
"Old branchname too long"
);
...
...
builtin-for-each-ref.c
浏览文件 @
3dff5379
...
...
@@ -135,7 +135,7 @@ static const char *find_next(const char *cp)
while
(
*
cp
)
{
if
(
*
cp
==
'%'
)
{
/* %( is the start of an atom;
* %% is a quote
e
d per-cent.
* %% is a quoted per-cent.
*/
if
(
cp
[
1
]
==
'('
)
return
cp
;
...
...
builtin-fsck.c
浏览文件 @
3dff5379
...
...
@@ -117,7 +117,7 @@ static void check_unreachable_object(struct object *obj)
/*
* "!used" means that nothing at all points to it, including
* other unreac
ah
ble objects. In other words, it's the "tip"
* other unreac
ha
ble objects. In other words, it's the "tip"
* of some set of unreachable objects, usually a commit that
* got dropped.
*
...
...
daemon.c
浏览文件 @
3dff5379
...
...
@@ -408,7 +408,7 @@ static void make_service_overridable(const char *name, int ena) {
/*
* Separate the "extra args" information as supplied by the client connection.
* Any resulting data is squirrel
l
ed away in the given interpolation table.
* Any resulting data is squirreled away in the given interpolation table.
*/
static
void
parse_extra_args
(
struct
interp
*
table
,
char
*
extra_args
,
int
buflen
)
{
...
...
git-merge-resolve.sh
浏览文件 @
3dff5379
...
...
@@ -3,7 +3,7 @@
# Copyright (c) 2005 Linus Torvalds
# Copyright (c) 2005 Junio C Hamano
#
# Resolve two trees, using enhancd multi-base read-tree.
# Resolve two trees, using enhanc
e
d multi-base read-tree.
# The first parameters up to -- are merge bases; the rest are heads.
bases
=
head
=
remotes
=
sep_seen
=
...
...
git-quiltimport.sh
浏览文件 @
3dff5379
...
...
@@ -59,7 +59,7 @@ if ! [ -d "$QUILT_PATCHES" ] ; then
exit
1
fi
# Temporay directories
# Tempora
r
y directories
tmp_dir
=
.dotest
tmp_msg
=
"
$tmp_dir
/msg"
tmp_patch
=
"
$tmp_dir
/patch"
...
...
gitweb/gitweb.perl
浏览文件 @
3dff5379
...
...
@@ -834,7 +834,7 @@ sub file_type_long {
## ----------------------------------------------------------------------
## functions returning short HTML fragments, or transforming HTML fragments
## which don't bel
i
ng to other sections
## which don't bel
o
ng to other sections
# format line of commit message.
sub format_log_line_html {
...
...
merge-recursive.c
浏览文件 @
3dff5379
...
...
@@ -386,7 +386,7 @@ struct rename
};
/*
* Get information of all renames which occured between 'o_tree' and
* Get information of all renames which occur
r
ed between 'o_tree' and
* 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
* 'b_tree') to be able to associate the correct cache entries with
* the rename information. 'tree' is always equal to either a_tree or b_tree.
...
...
@@ -1175,7 +1175,7 @@ static struct commit_list *reverse_commit_list(struct commit_list *list)
/*
* 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 clean
n
ess of the merge.
*/
static
int
merge
(
struct
commit
*
h1
,
struct
commit
*
h2
,
...
...
@@ -1222,8 +1222,8 @@ static int merge(struct commit *h1,
/*
* When the merge fails, the result contains files
* with conflict markers. The cleanness flag is
* ignored, it was never ac
ut
ally used, as result of
* merge_trees has always overwritten it: the commited
* ignored, it was never ac
tu
ally used, as result of
* merge_trees has always overwritten it: the commit
t
ed
* "conflicts" were already resolved.
*/
discard_cache
();
...
...
perl/Git.pm
浏览文件 @
3dff5379
...
...
@@ -354,7 +354,7 @@ sub command_input_pipe {
=item command_close_pipe ( PIPE [, CTX ] )
Close the C<PIPE> as returned from C<command_*_pipe()>, checking
whether the command finished successfuly. The optional C<CTX> argument
whether the command finished successful
l
y. The optional C<CTX> argument
is required if you want to see the command name in the error message,
and it is the second value returned by C<command_*_pipe()> when
called in array context. The call idiom is:
...
...
perl/private-Error.pm
浏览文件 @
3dff5379
...
...
@@ -781,7 +781,7 @@ =head1 $Error::ObjectifyCallback
This variable holds a reference to a subroutine that converts errors that
are plain strings to objects. It is used by Error.pm to convert textual
errors to objects, and can be overrid
ed
by the user.
errors to objects, and can be overrid
den
by the user.
It accepts a single argument which is a hash reference to named parameters.
Currently the only named parameter passed is C<'text'> which is the text
...
...
ppc/sha1ppc.S
浏览文件 @
3dff5379
...
...
@@ -18,7 +18,7 @@
*
%
r0
-
temp
*
%
r3
-
argument
(
pointer
to
5
words
of
SHA
state
)
*
%
r4
-
argument
(
pointer
to
data
to
hash
)
*
%
r5
-
Contant
K
in
SHA
round
(
initially
number
of
blocks
to
hash
)
*
%
r5
-
Con
s
tant
K
in
SHA
round
(
initially
number
of
blocks
to
hash
)
*
%
r6
-%
r10
-
Working
copies
of
SHA
variables
A
..
E
(
actually
E
..
A
order
)
*
%
r11
-%
r26
-
Data
being
hashed
W
[]
.
*
%
r27
-%
r31
-
Previous
copies
of
A
..
E
,
for
final
add
back
.
...
...
@@ -48,7 +48,7 @@
*
E
+=
ROTL
(
A
,
5
)
+
F
(
B
,
C
,
D
)
+
W
[
i
]
+
K
; B = ROTL(B,30)
*
Then
the
variables
are
renamed
:
(
A
,
B
,
C
,
D
,
E
)
=
(
E
,
A
,
B
,
C
,
D
)
.
*
*
Every
20
rounds
,
the
function
F
()
and
the
contant
K
changes
:
*
Every
20
rounds
,
the
function
F
()
and
the
con
s
tant
K
changes
:
*
-
20
rounds
of
f0
(
b
,
c
,
d
)
=
"bit wise b ? c : d"
=
(^
b
&
d
)
+
(
b
&
c
)
*
-
20
rounds
of
f1
(
b
,
c
,
d
)
=
b
^
c
^
d
=
(
b
^
d
)^
c
*
-
20
rounds
of
f2
(
b
,
c
,
d
)
=
majority
(
b
,
c
,
d
)
=
(
b
&d
)
+
((
b
^
d
)
&c
)
...
...
@@ -57,7 +57,7 @@
*
These
are
all
scheduled
for
near
-
optimal
performance
on
a
G4
.
*
The
G4
is
a
3
-
issue
out
-
of
-
order
machine
with
3
ALUs
,
but
it
can
only
*
*
consider
*
starting
the
oldest
3
instructions
per
cycle
.
So
to
get
*
maximum
performace
out
of
it
,
you
have
to
treat
it
as
an
in
-
order
*
maximum
performa
n
ce
out
of
it
,
you
have
to
treat
it
as
an
in
-
order
*
machine
.
Which
means
interleaving
the
computation
round
t
with
the
*
computation
of
W
[
t
+
4
]
.
*
...
...
sha1_file.c
浏览文件 @
3dff5379
...
...
@@ -1163,7 +1163,7 @@ static unsigned long unpack_object_header(struct packed_git *p,
/* use_pack() assures us we have [base, base + 20) available
* as a range that we can look at at. (Its actually the hash
* size that is assur
r
ed.) With our object header encoding
* size that is assured.) With our object header encoding
* the maximum deflated object size is 2^137, which is just
* insane, so we know won't exceed what we have been given.
*/
...
...
t/t1004-read-tree-m-u-wf.sh
浏览文件 @
3dff5379
...
...
@@ -87,7 +87,7 @@ test_expect_success 'three-way not complaining on an untracked path in both' '
git-read-tree -m -u branch-point master side
'
test_expect_success
'three-way not clob
er
ring a working tree file'
'
test_expect_success
'three-way not clob
be
ring a working tree file'
'
git reset --hard &&
rm -f file2 subdir/file2 file3 subdir/file3 &&
...
...
t/t1020-subdirectory.sh
浏览文件 @
3dff5379
...
...
@@ -106,21 +106,21 @@ test_expect_success 'read-tree' '
cmp ../one ../original.one
'
test_expect_success
'no file/rev amb
u
guity check inside .git'
'
test_expect_success
'no file/rev amb
i
guity check inside .git'
'
cd $HERE &&
git commit -a -m 1 &&
cd $HERE/.git &&
git show -s HEAD
'
test_expect_success
'no file/rev amb
u
guity check inside a bare repo'
'
test_expect_success
'no file/rev amb
i
guity check inside a bare repo'
'
cd $HERE &&
git clone -s --bare .git foo.git &&
cd foo.git && GIT_DIR=. git show -s HEAD
'
# This still does not work as it should...
: test_expect_success
'no file/rev amb
u
guity check inside a bare repo'
'
: test_expect_success
'no file/rev amb
i
guity check inside a bare repo'
'
cd $HERE &&
git clone -s --bare .git foo.git &&
cd foo.git && git show -s HEAD
...
...
t/t3800-mktag.sh
浏览文件 @
3dff5379
...
...
@@ -172,7 +172,7 @@ EOF
check_verify_failure
'verify tag-name check'
############################################################
# 11. tagger line lab
le
check #1
# 11. tagger line lab
el
check #1
cat
>
tag.sig
<<
EOF
object
$head
...
...
@@ -187,7 +187,7 @@ EOF
check_verify_failure
'"tagger" line label check #1'
############################################################
# 12. tagger line lab
le
check #2
# 12. tagger line lab
el
check #2
cat
>
tag.sig
<<
EOF
object
$head
...
...
t/t5000-tar-tree.sh
浏览文件 @
3dff5379
...
...
@@ -10,7 +10,7 @@ commit id embedding:
The contents of the repository is compared to the extracted tar
archive. The repository contains simple text files, symlinks and a
binary file (/bin/sh). Only path
e
s shorter than 99 characters are
binary file (/bin/sh). Only paths shorter than 99 characters are
used.
git-tar-tree applies the commit date to every file in the archive it
...
...
t/t5600-clone-fail-cleanup.sh
浏览文件 @
3dff5379
...
...
@@ -36,7 +36,7 @@ test_expect_success \
'git-clone foo bar'
test_expect_success
\
'successful
l
clone must leave the directory'
\
'successful clone must leave the directory'
\
'cd bar'
test_done
t/t9101-git-svn-props.sh
浏览文件 @
3dff5379
...
...
@@ -70,7 +70,7 @@ name='test svn:keywords ignoring'
test_expect_success
"
$name
"
\
'git checkout -b mybranch remotes/git-svn &&
echo Hi again >> kw.c &&
git commit -a -m "test keywo
a
rds ignoring" &&
git commit -a -m "test keywords ignoring" &&
git-svn set-tree remotes/git-svn..mybranch &&
git pull . remotes/git-svn'
...
...
templates/Makefile
浏览文件 @
3dff5379
...
...
@@ -6,7 +6,7 @@ prefix ?= $(HOME)
template_dir
?=
$(prefix)
/share/git-core/templates/
# DESTDIR=
# Shell quote (do not use $(call) to accomodate ancient setups);
# Shell quote (do not use $(call) to accom
m
odate ancient setups);
DESTDIR_SQ
=
$(
subst
','
\'
',
$(DESTDIR)
)
template_dir_SQ
=
$(
subst
'
,
'\'',
$(template_dir)
)
...
...
templates/hooks--update
浏览文件 @
3dff5379
...
...
@@ -61,7 +61,7 @@ newrev_type=$(git-cat-file -t "$newrev")
case
"
$refname
"
,
"
$newrev_type
"
in
refs/tags/
*
,commit
)
# un-annoted tag
# un-annot
at
ed tag
refname_type
=
"tag"
short_refname
=
${
refname
##refs/tags/
}
if
[
$allowunannotated
!=
"true"
]
;
then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录