Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
be38bee8
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,发现更多精彩内容 >>
提交
be38bee8
编写于
12月 02, 2013
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Sync with 1.8.4.5
上级
d2446dfd
2f93541d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
45 addition
and
6 deletion
+45
-6
Documentation/RelNotes/1.8.4.5.txt
Documentation/RelNotes/1.8.4.5.txt
+13
-0
Documentation/git.txt
Documentation/git.txt
+2
-1
git-submodule.sh
git-submodule.sh
+15
-5
t/t7406-submodule-update.sh
t/t7406-submodule-update.sh
+15
-0
未找到文件。
Documentation/RelNotes/1.8.4.5.txt
0 → 100644
浏览文件 @
be38bee8
Git v1.8.4.5 Release Notes
==========================
Fixes since v1.8.4.4
--------------------
* Recent update to remote-hg that attempted to make it work better
with non ASCII pathnames fed Unicode strings to the underlying Hg
API, which was wrong.
* "git submodule init" copied "submodule.$name.update" settings from
.gitmodules to .git/config without making sure if the suggested
value was sensible.
Documentation/git.txt
浏览文件 @
be38bee8
...
...
@@ -48,9 +48,10 @@ Documentation for older releases are available here:
* release notes for
link:RelNotes/1.8.5.txt[1.8.5].
* link:v1.8.4.
4/git.html[documentation for release 1.8.4.4
]
* link:v1.8.4.
5/git.html[documentation for release 1.8.4.5
]
* release notes for
link:RelNotes/1.8.4.5.txt[1.8.4.5],
link:RelNotes/1.8.4.4.txt[1.8.4.4],
link:RelNotes/1.8.4.3.txt[1.8.4.3],
link:RelNotes/1.8.4.2.txt[1.8.4.2],
...
...
git-submodule.sh
浏览文件 @
be38bee8
...
...
@@ -612,11 +612,21 @@ cmd_init()
fi
# Copy "update" setting when it is not set yet
upd
=
"
$(
git config
-f
.gitmodules submodule.
"
$name
"
.update
)
"
test
-z
"
$upd
"
||
test
-n
"
$(
git config submodule.
"
$name
"
.update
)
"
||
git config submodule.
"
$name
"
.update
"
$upd
"
||
die
"
$(
eval_gettext
"Failed to register update mode for submodule path '
\$
displaypath'"
)
"
if
upd
=
"
$(
git config
-f
.gitmodules submodule.
"
$name
"
.update
)
"
&&
test
-n
"
$upd
"
&&
test
-z
"
$(
git config submodule.
"
$name
"
.update
)
"
then
case
"
$upd
"
in
rebase
|
merge
|
none
)
;;
# known modes of updating
*
)
echo
>
&2
"warning: unknown update mode '
$upd
' suggested for submodule '
$name
'"
upd
=
none
;;
esac
git config submodule.
"
$name
"
.update
"
$upd
"
||
die
"
$(
eval_gettext
"Failed to register update mode for submodule path '
\$
displaypath'"
)
"
fi
done
}
...
...
t/t7406-submodule-update.sh
浏览文件 @
be38bee8
...
...
@@ -323,6 +323,21 @@ test_expect_success 'submodule update - command in .git/config catches failure'
)
'
test_expect_success
'submodule init does not copy command into .git/config'
'
(cd super &&
H=$(git ls-files -s submodule | cut -d" " -f2) &&
mkdir submodule1 &&
git update-index --add --cacheinfo 160000 $H submodule1 &&
git config -f .gitmodules submodule.submodule1.path submodule1 &&
git config -f .gitmodules submodule.submodule1.url ../submodule &&
git config -f .gitmodules submodule.submodule1.update !false &&
git submodule init submodule1 &&
echo "none" >expect &&
git config submodule.submodule1.update >actual &&
test_cmp expect actual
)
'
test_expect_success
'submodule init picks up rebase'
'
(cd super &&
git config -f .gitmodules submodule.rebasing.update rebase &&
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录