Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
cfd10568
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,发现更多精彩内容 >>
提交
cfd10568
编写于
10月 28, 2013
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Sync with v1.8.4.2
上级
f43bc33e
dcb11cca
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
3 deletion
+18
-3
Documentation/RelNotes/1.8.4.2.txt
Documentation/RelNotes/1.8.4.2.txt
+14
-0
Documentation/git.txt
Documentation/git.txt
+2
-1
sha1_file.c
sha1_file.c
+1
-1
t/test-lib.sh
t/test-lib.sh
+1
-1
未找到文件。
Documentation/RelNotes/1.8.4.2.txt
浏览文件 @
cfd10568
...
...
@@ -4,6 +4,20 @@ Git v1.8.4.2 Release Notes
Fixes since v1.8.4.1
--------------------
* "git clone" gave some progress messages to the standard output, not
to the standard error, and did not allow suppressing them with the
"--no-progress" option.
* "format-patch --from=<whom>" forgot to omit unnecessary in-body
from line, i.e. when <whom> is the same as the real author.
* "git shortlog" used to choke and die when there is a malformed
commit (e.g. missing authors); it now simply ignore such a commit
and keeps going.
* "git merge-recursive" did not parse its "--diff-algorithm=" command
line option correctly.
* "git branch --track" had a minor regression in v1.8.3.2 and later
that made it impossible to base your local work on anything but a
local branch of the upstream repository you are tracking from.
...
...
Documentation/git.txt
浏览文件 @
cfd10568
...
...
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
* link:v1.8.4.
1/git.html[documentation for release 1.8.4.1
]
* link:v1.8.4.
2/git.html[documentation for release 1.8.4.2
]
* release notes for
link:RelNotes/1.8.4.2.txt[1.8.4.2],
link:RelNotes/1.8.4.1.txt[1.8.4.1],
link:RelNotes/1.8.4.txt[1.8.4].
...
...
sha1_file.c
浏览文件 @
cfd10568
...
...
@@ -2514,7 +2514,6 @@ static int sha1_loose_object_info(const unsigned char *sha1,
return
0
;
}
/* returns enum object_type or negative */
int
sha1_object_info_extended
(
const
unsigned
char
*
sha1
,
struct
object_info
*
oi
)
{
struct
cached_object
*
co
;
...
...
@@ -2563,6 +2562,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi)
return
0
;
}
/* returns enum object_type or negative */
int
sha1_object_info
(
const
unsigned
char
*
sha1
,
unsigned
long
*
sizep
)
{
enum
object_type
type
;
...
...
t/test-lib.sh
浏览文件 @
cfd10568
...
...
@@ -325,7 +325,7 @@ trap 'die' EXIT
.
"
$TEST_DIRECTORY
/test-lib-functions.sh"
# You are not expected to call test_ok_ and test_failure_ directly, use
# the te
x
t_expect_* functions instead.
# the te
s
t_expect_* functions instead.
test_ok_
()
{
test_success
=
$((
$test_success
+
1
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录