Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
1cf32f4d
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,发现更多精彩内容 >>
提交
1cf32f4d
编写于
4月 25, 2015
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
merge: make collect_parents() auto-generate the merge message
Signed-off-by:
N
Junio C Hamano
<
gitster@pobox.com
>
上级
52fecab2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
22 addition
and
14 deletion
+22
-14
builtin/merge.c
builtin/merge.c
+22
-14
未找到文件。
builtin/merge.c
浏览文件 @
1cf32f4d
...
...
@@ -1092,7 +1092,8 @@ static void prepare_merge_message(struct strbuf *merge_names, struct strbuf *mer
static
struct
commit_list
*
collect_parents
(
struct
commit
*
head_commit
,
int
*
head_subsumed
,
int
argc
,
const
char
**
argv
)
int
argc
,
const
char
**
argv
,
struct
strbuf
*
merge_msg
)
{
int
i
;
struct
commit_list
*
remoteheads
=
NULL
;
...
...
@@ -1108,7 +1109,20 @@ static struct commit_list *collect_parents(struct commit *head_commit,
remotes
=
&
commit_list_insert
(
commit
,
remotes
)
->
next
;
}
return
reduce_parents
(
head_commit
,
head_subsumed
,
remoteheads
);
remoteheads
=
reduce_parents
(
head_commit
,
head_subsumed
,
remoteheads
);
if
(
merge_msg
&&
(
!
have_message
||
shortlog_len
))
{
struct
strbuf
merge_names
=
STRBUF_INIT
;
struct
commit_list
*
p
;
for
(
p
=
remoteheads
;
p
;
p
=
p
->
next
)
merge_name
(
merge_remote_util
(
p
->
item
)
->
name
,
&
merge_names
);
prepare_merge_message
(
&
merge_names
,
merge_msg
);
strbuf_release
(
&
merge_names
);
}
return
remoteheads
;
}
int
cmd_merge
(
int
argc
,
const
char
**
argv
,
const
char
*
prefix
)
...
...
@@ -1222,7 +1236,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
if
(
fast_forward
==
FF_NO
)
die
(
_
(
"Non-fast-forward commit does not make sense into "
"an empty head"
));
remoteheads
=
collect_parents
(
head_commit
,
&
head_subsumed
,
argc
,
argv
);
remoteheads
=
collect_parents
(
head_commit
,
&
head_subsumed
,
argc
,
argv
,
NULL
);
remote_head
=
remoteheads
->
item
;
if
(
!
remote_head
)
die
(
_
(
"%s - not something we can merge"
),
argv
[
0
]);
...
...
@@ -1248,7 +1263,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
head_arg
=
argv
[
1
];
argv
+=
2
;
argc
-=
2
;
remoteheads
=
collect_parents
(
head_commit
,
&
head_subsumed
,
argc
,
argv
);
remoteheads
=
collect_parents
(
head_commit
,
&
head_subsumed
,
argc
,
argv
,
NULL
);
}
else
{
/* We are invoked directly as the first-class UI. */
head_arg
=
"HEAD"
;
...
...
@@ -1258,16 +1274,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* the standard merge summary message to be appended
* to the given message.
*/
remoteheads
=
collect_parents
(
head_commit
,
&
head_subsumed
,
argc
,
argv
);
if
(
!
have_message
||
shortlog_len
)
{
struct
strbuf
merge_names
=
STRBUF_INIT
;
for
(
p
=
remoteheads
;
p
;
p
=
p
->
next
)
merge_name
(
merge_remote_util
(
p
->
item
)
->
name
,
&
merge_names
);
prepare_merge_message
(
&
merge_names
,
&
merge_msg
);
strbuf_release
(
&
merge_names
);
}
remoteheads
=
collect_parents
(
head_commit
,
&
head_subsumed
,
argc
,
argv
,
&
merge_msg
);
}
if
(
!
head_commit
||
!
argc
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录