Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
4d06691e
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,发现更多精彩内容 >>
提交
4d06691e
编写于
2月 26, 2012
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Sync with 1.7.8.5
上级
09ccbd34
c524ceb1
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
39 addition
and
6 deletion
+39
-6
Documentation/RelNotes/1.7.8.5.txt
Documentation/RelNotes/1.7.8.5.txt
+19
-0
Makefile
Makefile
+1
-0
git-am.sh
git-am.sh
+1
-1
git-rebase--merge.sh
git-rebase--merge.sh
+7
-4
grep.c
grep.c
+1
-1
t/t4150-am.sh
t/t4150-am.sh
+10
-0
未找到文件。
Documentation/RelNotes/1.7.8.5.txt
0 → 100644
浏览文件 @
4d06691e
Git v1.7.8.5 Release Notes
==========================
Fixes since v1.7.8.4
--------------------
* Dependency on our thread-utils.h header file was missing for
objects that depend on it in the Makefile.
* "git am" when fed an empty file did not correctly finish reading it
when it attempts to guess the input format.
* "git grep -P" (when PCRE is enabled in the build) did not match the
beginning and the end of the line correctly with ^ and $.
* "git rebase -m" tried to run "git notes copy" needlessly when
nothing was rewritten.
Also contains minor fixes and documentation updates.
Makefile
浏览文件 @
4d06691e
...
...
@@ -615,6 +615,7 @@ LIB_H += streaming.h
LIB_H
+=
string-list.h
LIB_H
+=
submodule.h
LIB_H
+=
tag.h
LIB_H
+=
thread-utils.h
LIB_H
+=
transport.h
LIB_H
+=
tree.h
LIB_H
+=
tree-walk.h
...
...
git-am.sh
浏览文件 @
4d06691e
...
...
@@ -201,7 +201,7 @@ check_patch_format () {
l1
=
while
test
-z
"
$l1
"
do
read
l1
read
l1
||
break
done
read
l2
read
l3
...
...
git-rebase--merge.sh
浏览文件 @
4d06691e
...
...
@@ -90,10 +90,13 @@ call_merge () {
finish_rb_merge
()
{
move_to_original_branch
git notes copy
--for-rewrite
=
rebase <
"
$state_dir
"
/rewritten
if
test
-x
"
$GIT_DIR
"
/hooks/post-rewrite
&&
test
-s
"
$state_dir
"
/rewritten
;
then
"
$GIT_DIR
"
/hooks/post-rewrite rebase <
"
$state_dir
"
/rewritten
if
test
-s
"
$state_dir
"
/rewritten
then
git notes copy
--for-rewrite
=
rebase <
"
$state_dir
"
/rewritten
if
test
-x
"
$GIT_DIR
"
/hooks/post-rewrite
then
"
$GIT_DIR
"
/hooks/post-rewrite rebase <
"
$state_dir
"
/rewritten
fi
fi
rm
-r
"
$state_dir
"
say All
done
.
...
...
grep.c
浏览文件 @
4d06691e
...
...
@@ -79,7 +79,7 @@ static void compile_pcre_regexp(struct grep_pat *p, const struct grep_opt *opt)
{
const
char
*
error
;
int
erroffset
;
int
options
=
0
;
int
options
=
PCRE_MULTILINE
;
if
(
opt
->
ignore_case
)
options
|=
PCRE_CASELESS
;
...
...
t/t4150-am.sh
浏览文件 @
4d06691e
...
...
@@ -495,4 +495,14 @@ test_expect_success 'am -q is quiet' '
! test -s output.out
'
test_expect_success
'am empty-file does not infloop'
'
rm -fr .git/rebase-apply &&
git reset --hard &&
touch empty-file &&
test_tick &&
{ git am empty-file > actual 2>&1 && false || :; } &&
echo Patch format detection failed. >expected &&
test_cmp expected actual
'
test_done
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录