Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
5bd148bf
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,发现更多精彩内容 >>
提交
5bd148bf
编写于
6月 16, 2007
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'maint' to sync with GIT 1.5.2.2
上级
c5f71ad0
c7c84859
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
109 addition
and
6 deletion
+109
-6
.gitignore
.gitignore
+1
-1
Documentation/Makefile
Documentation/Makefile
+3
-0
Documentation/RelNotes-1.5.2.2.txt
Documentation/RelNotes-1.5.2.2.txt
+61
-0
Documentation/asciidoc.conf
Documentation/asciidoc.conf
+2
-1
Documentation/git-cvsexportcommit.txt
Documentation/git-cvsexportcommit.txt
+1
-1
Documentation/user-manual.txt
Documentation/user-manual.txt
+2
-2
Makefile
Makefile
+11
-0
compat/hstrerror.c
compat/hstrerror.c
+21
-0
git-compat-util.h
git-compat-util.h
+5
-0
revision.c
revision.c
+2
-1
未找到文件。
.gitignore
浏览文件 @
5bd148bf
...
...
@@ -157,7 +157,7 @@ common-cmds.h
*.tar.gz
*.dsc
*.deb
git
-core
.spec
git.spec
*.exe
*.[aos]
*.py[co]
...
...
Documentation/Makefile
浏览文件 @
5bd148bf
...
...
@@ -37,6 +37,9 @@ man7dir=$(mandir)/man7
ASCIIDOC
=
asciidoc
ASCIIDOC_EXTRA
=
ifdef
ASCIIDOC8
ASCIIDOC_EXTRA
+=
-a
asciidoc7compatible
endif
INSTALL
?=
install
DOC_REF
=
origin/man
...
...
Documentation/RelNotes-1.5.2.2.txt
0 → 100644
浏览文件 @
5bd148bf
GIT v1.5.2.2 Release Notes
==========================
Fixes since v1.5.2.1
--------------------
* Usability fix
- git-gui is shipped with its updated blame interface. It is
rumored that the older one was not just unusable but was
active health hazard, but this one is actually pretty.
Please see for yourself.
* Bugfixes
- "git checkout fubar" was utterly confused when there is a
branch fubar and a tag fubar at the same time. It correctly
checks out the branch fubar now.
- "git clone /path/foo" to clone a local /path/foo.git
repository left an incorrect configuration.
- "git send-email" correctly unquotes RFC 2047 quoted names in
the patch-email before using their values.
- We did not accept number of seconds since epoch older than
year 2000 as a valid timestamp. We now interpret positive
integers more than 8 digits as such, which allows us to
express timestamps more recent than March 1973.
- git-cvsimport did not work when you have GIT_DIR to point
your repository at a nonstandard location.
- Some systems (notably, Solaris) lack hstrerror() to make
h_errno human readable; prepare a replacement
implementation.
- .gitignore file listed git-core.spec but what we generate is
git.spec, and nobody noticed for a long time.
- "git-merge-recursive" does not try to run file level merge
on binary files.
- "git-branch --track" did not create tracking configuration
correctly when the branch name had slash in it.
- The email address of the user specified with user.email
configuration was overriden by EMAIL environment variable.
- The tree parser did not warn about tree entries with
nonsense file modes, and assumed they must be blobs.
- "git log -z" without any other request to generate diff still
invoked the diff machinery, wasting cycles.
* Documentation
- Many updates to fix stale or missing documentation.
- Although our documentation was primarily meant to be formatted
with AsciiDoc7, formatting with AsciiDoc8 is supported better.
Documentation/asciidoc.conf
浏览文件 @
5bd148bf
...
...
@@ -8,7 +8,8 @@
# the command.
[
attributes
]
caret
=^
plus
=&
#43;
caret
=&
#94;
startsb
=&
#91;
endsb
=&
#93;
tilde
=&
#126;
...
...
Documentation/git-cvsexportcommit.txt
浏览文件 @
5bd148bf
...
...
@@ -76,7 +76,7 @@ $ git-cvsexportcommit -v <commit-sha1>
$ cvs commit -F .mgs <files>
------------
Merge pending patches into CVS automatically -- only if you really know what you are doing
::
Merge pending patches into CVS automatically -- only if you really know what you are doing::
+
------------
$ export GIT_DIR=~/project/.git
...
...
Documentation/user-manual.txt
浏览文件 @
5bd148bf
...
...
@@ -2757,8 +2757,8 @@ As a result, the general consistency of an object can always be tested
independently of the contents or the type of the object: all objects can
be validated by verifying that (a) their hashes match the content of the
file and (b) the object successfully inflates to a stream of bytes that
forms a sequence of <ascii type without space>
+ <space> +
<ascii decimal
size>
+ <byte\0> +
<binary object data>.
forms a sequence of <ascii type without space>
{plus} <space> {plus}
<ascii decimal
size>
{plus} <byte\0> {plus}
<binary object data>.
The structured objects can further have their structure and
connectivity to other objects verified. This is generally done with
...
...
Makefile
浏览文件 @
5bd148bf
...
...
@@ -107,6 +107,8 @@ all::
# Define USE_STDEV below if you want git to care about the underlying device
# change being considered an inode change from the update-cache perspective.
#
# Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
#
# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
# MakeMaker (e.g. using ActiveState under Cygwin).
#
...
...
@@ -410,6 +412,7 @@ ifeq ($(uname_S),SunOS)
NEEDS_NSL
=
YesPlease
SHELL_PATH
=
/bin/bash
NO_STRCASESTR
=
YesPlease
NO_HSTRERROR
=
YesPlease
ifeq
($(uname_R),5.8)
NEEDS_LIBICONV
=
YesPlease
NO_UNSETENV
=
YesPlease
...
...
@@ -654,6 +657,10 @@ endif
ifdef
NO_PERL_MAKEMAKER
export
NO_PERL_MAKEMAKER
endif
ifdef
NO_HSTRERROR
COMPAT_CFLAGS
+=
-DNO_HSTRERROR
COMPAT_OBJS
+=
compat/hstrerror.o
endif
ifeq
($(TCLTK_PATH),)
NO_TCLTK
=
NoThanks
...
...
@@ -684,6 +691,10 @@ ifndef V
endif
endif
ifdef
ASCIIDOC8
export
ASCIIDOC8
endif
# Shell quote (do not use $(call) to accommodate ancient setups);
SHA1_HEADER_SQ
=
$(
subst
','
\'
',
$(SHA1_HEADER)
)
...
...
compat/hstrerror.c
0 → 100644
浏览文件 @
5bd148bf
#include <string.h>
#include <stdio.h>
#include <netdb.h>
const
char
*
githstrerror
(
int
err
)
{
static
char
buffer
[
48
];
switch
(
err
)
{
case
HOST_NOT_FOUND
:
return
"Authoritative answer: host not found"
;
case
NO_DATA
:
return
"Valid name, no data record of requested type"
;
case
NO_RECOVERY
:
return
"Non recoverable errors, FORMERR, REFUSED, NOTIMP"
;
case
TRY_AGAIN
:
return
"Non-authoritative
\"
host not found
\"
, or SERVERFAIL"
;
}
sprintf
(
buffer
,
"Name resolution error %d"
,
err
);
return
buffer
;
}
git-compat-util.h
浏览文件 @
5bd148bf
...
...
@@ -167,6 +167,11 @@ extern size_t gitstrlcpy(char *, const char *, size_t);
extern
uintmax_t
gitstrtoumax
(
const
char
*
,
char
**
,
int
);
#endif
#ifdef NO_HSTRERROR
#define hstrerror githstrerror
extern
const
char
*
githstrerror
(
int
herror
);
#endif
extern
void
release_pack_memory
(
size_t
,
int
);
static
inline
char
*
xstrdup
(
const
char
*
str
)
...
...
revision.c
浏览文件 @
5bd148bf
...
...
@@ -1180,7 +1180,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
opts
=
diff_opt_parse
(
&
revs
->
diffopt
,
argv
+
i
,
argc
-
i
);
if
(
opts
>
0
)
{
revs
->
diff
=
1
;
if
(
strcmp
(
argv
[
i
],
"-z"
))
revs
->
diff
=
1
;
i
+=
opts
-
1
;
continue
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录