Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
a3d470c2
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,发现更多精彩内容 >>
提交
a3d470c2
编写于
7月 05, 2006
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'jc/fmt-merge-msg-test'
* jc/fmt-merge-msg-test: t6200: fmt-merge-msg test.
上级
b296990c
30a95f30
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
163 addition
and
0 deletion
+163
-0
t/t6200-fmt-merge-msg.sh
t/t6200-fmt-merge-msg.sh
+163
-0
未找到文件。
t/t6200-fmt-merge-msg.sh
0 → 100755
浏览文件 @
a3d470c2
#!/bin/sh
#
# Copyright (c) 2006, Junio C Hamano
#
test_description
=
'fmt-merge-msg test'
.
./test-lib.sh
datestamp
=
1151939923
setdate
()
{
GIT_COMMITTER_DATE
=
"
$datestamp
+0200"
GIT_AUTHOR_DATE
=
"
$datestamp
+0200"
datestamp
=
`
expr
"
$datestamp
"
+ 1
`
export
GIT_COMMITTER_DATE GIT_AUTHOR_DATE
}
test_expect_success setup
'
echo one >one &&
git add one &&
setdate &&
git commit -m "Initial" &&
echo uno >one &&
echo dos >two &&
git add two &&
setdate &&
git commit -a -m "Second" &&
git checkout -b left &&
echo $datestamp >one &&
setdate &&
git commit -a -m "Common #1" &&
echo $datestamp >one &&
setdate &&
git commit -a -m "Common #2" &&
git branch right &&
echo $datestamp >two &&
setdate &&
git commit -a -m "Left #3" &&
echo $datestamp >two &&
setdate &&
git commit -a -m "Left #4" &&
echo $datestamp >two &&
setdate &&
git commit -a -m "Left #5" &&
git checkout right &&
echo $datestamp >three &&
git add three &&
setdate &&
git commit -a -m "Right #3" &&
echo $datestamp >three &&
setdate &&
git commit -a -m "Right #4" &&
echo $datestamp >three &&
setdate &&
git commit -a -m "Right #5" &&
git show-branch
'
cat
>
expected
<<
\
EOF
Merge branch 'left'
EOF
test_expect_success
'merge-msg test #1'
'
git checkout master &&
git fetch . left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
diff -u actual expected
'
cat
>
expected
<<
\
EOF
Merge branch 'left' of ../trash
EOF
test_expect_success
'merge-msg test #2'
'
git checkout master &&
git fetch ../trash left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
diff -u actual expected
'
cat
>
expected
<<
\
EOF
Merge branch 'left'
* left:
Left #5
Left #4
Left #3
Common #2
Common #1
EOF
test_expect_success
'merge-msg test #3'
'
git repo-config merge.summary true &&
git checkout master &&
setdate &&
git fetch . left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
diff -u actual expected
'
cat
>
expected
<<
\
EOF
Merge branches 'left' and 'right'
* left:
Left #5
Left #4
Left #3
Common #2
Common #1
* right:
Right #5
Right #4
Right #3
Common #2
Common #1
EOF
test_expect_success
'merge-msg test #4'
'
git repo-config merge.summary true &&
git checkout master &&
setdate &&
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
diff -u actual expected
'
test_expect_success
'merge-msg test #5'
'
git repo-config merge.summary yes &&
git checkout master &&
setdate &&
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
diff -u actual expected
'
test_done
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录