Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
738c2187
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,发现更多精彩内容 >>
提交
738c2187
编写于
9月 11, 2012
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'tr/void-diff-setup-done' into maint-1.7.11
* tr/void-diff-setup-done: diff_setup_done(): return void
上级
3f835949
28452655
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
16 addition
and
32 deletion
+16
-32
builtin/blame.c
builtin/blame.c
+3
-6
builtin/checkout.c
builtin/checkout.c
+1
-2
builtin/diff.c
builtin/diff.c
+1
-2
builtin/merge.c
builtin/merge.c
+1
-2
diff-no-index.c
diff-no-index.c
+1
-2
diff.c
diff.c
+1
-3
diff.h
diff.h
+1
-1
merge-recursive.c
merge-recursive.c
+1
-2
notes-merge.c
notes-merge.c
+2
-4
patch-ids.c
patch-ids.c
+1
-2
revision.c
revision.c
+1
-2
submodule.c
submodule.c
+1
-2
tree-diff.c
tree-diff.c
+1
-2
未找到文件。
builtin/blame.c
浏览文件 @
738c2187
...
...
@@ -407,8 +407,7 @@ static struct origin *find_origin(struct scoreboard *sb,
paths
[
1
]
=
NULL
;
diff_tree_setup_paths
(
paths
,
&
diff_opts
);
if
(
diff_setup_done
(
&
diff_opts
)
<
0
)
die
(
"diff-setup"
);
diff_setup_done
(
&
diff_opts
);
if
(
is_null_sha1
(
origin
->
commit
->
object
.
sha1
))
do_diff_cache
(
parent
->
tree
->
object
.
sha1
,
&
diff_opts
);
...
...
@@ -494,8 +493,7 @@ static struct origin *find_rename(struct scoreboard *sb,
diff_opts
.
single_follow
=
origin
->
path
;
paths
[
0
]
=
NULL
;
diff_tree_setup_paths
(
paths
,
&
diff_opts
);
if
(
diff_setup_done
(
&
diff_opts
)
<
0
)
die
(
"diff-setup"
);
diff_setup_done
(
&
diff_opts
);
if
(
is_null_sha1
(
origin
->
commit
->
object
.
sha1
))
do_diff_cache
(
parent
->
tree
->
object
.
sha1
,
&
diff_opts
);
...
...
@@ -1075,8 +1073,7 @@ static int find_copy_in_parent(struct scoreboard *sb,
paths
[
0
]
=
NULL
;
diff_tree_setup_paths
(
paths
,
&
diff_opts
);
if
(
diff_setup_done
(
&
diff_opts
)
<
0
)
die
(
"diff-setup"
);
diff_setup_done
(
&
diff_opts
);
/* Try "find copies harder" on new path if requested;
* we do not want to use diffcore_rename() actually to
...
...
builtin/checkout.c
浏览文件 @
738c2187
...
...
@@ -315,8 +315,7 @@ static void show_local_changes(struct object *head, struct diff_options *opts)
init_revisions
(
&
rev
,
NULL
);
rev
.
diffopt
.
flags
=
opts
->
flags
;
rev
.
diffopt
.
output_format
|=
DIFF_FORMAT_NAME_STATUS
;
if
(
diff_setup_done
(
&
rev
.
diffopt
)
<
0
)
die
(
_
(
"diff_setup_done failed"
));
diff_setup_done
(
&
rev
.
diffopt
);
add_pending_object
(
&
rev
,
head
,
NULL
);
run_diff_index
(
&
rev
,
0
);
}
...
...
builtin/diff.c
浏览文件 @
738c2187
...
...
@@ -302,8 +302,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
argc
=
setup_revisions
(
argc
,
argv
,
&
rev
,
NULL
);
if
(
!
rev
.
diffopt
.
output_format
)
{
rev
.
diffopt
.
output_format
=
DIFF_FORMAT_PATCH
;
if
(
diff_setup_done
(
&
rev
.
diffopt
)
<
0
)
die
(
_
(
"diff_setup_done failed"
));
diff_setup_done
(
&
rev
.
diffopt
);
}
DIFF_OPT_SET
(
&
rev
.
diffopt
,
RECURSIVE
);
...
...
builtin/merge.c
浏览文件 @
738c2187
...
...
@@ -404,8 +404,7 @@ static void finish(struct commit *head_commit,
opts
.
output_format
|=
DIFF_FORMAT_SUMMARY
|
DIFF_FORMAT_DIFFSTAT
;
opts
.
detect_rename
=
DIFF_DETECT_RENAME
;
if
(
diff_setup_done
(
&
opts
)
<
0
)
die
(
_
(
"diff_setup_done failed"
));
diff_setup_done
(
&
opts
);
diff_tree_sha1
(
head
,
new_head
,
""
,
&
opts
);
diffcore_std
(
&
opts
);
diff_flush
(
&
opts
);
...
...
diff-no-index.c
浏览文件 @
738c2187
...
...
@@ -258,8 +258,7 @@ void diff_no_index(struct rev_info *revs,
DIFF_OPT_SET
(
&
revs
->
diffopt
,
NO_INDEX
);
revs
->
max_count
=
-
2
;
if
(
diff_setup_done
(
&
revs
->
diffopt
)
<
0
)
die
(
"diff_setup_done failed"
);
diff_setup_done
(
&
revs
->
diffopt
);
setup_diff_pager
(
&
revs
->
diffopt
);
DIFF_OPT_SET
(
&
revs
->
diffopt
,
EXIT_WITH_STATUS
);
...
...
diff.c
浏览文件 @
738c2187
...
...
@@ -3187,7 +3187,7 @@ void diff_setup(struct diff_options *options)
}
}
int
diff_setup_done
(
struct
diff_options
*
options
)
void
diff_setup_done
(
struct
diff_options
*
options
)
{
int
count
=
0
;
...
...
@@ -3286,8 +3286,6 @@ int diff_setup_done(struct diff_options *options)
options
->
output_format
=
DIFF_FORMAT_NO_OUTPUT
;
DIFF_OPT_SET
(
options
,
EXIT_WITH_STATUS
);
}
return
0
;
}
static
int
opt_arg
(
const
char
*
arg
,
int
arg_short
,
const
char
*
arg_long
,
int
*
val
)
...
...
diff.h
浏览文件 @
738c2187
...
...
@@ -246,7 +246,7 @@ extern int git_diff_ui_config(const char *var, const char *value, void *cb);
extern
int
diff_use_color_default
;
extern
void
diff_setup
(
struct
diff_options
*
);
extern
int
diff_opt_parse
(
struct
diff_options
*
,
const
char
**
,
int
);
extern
int
diff_setup_done
(
struct
diff_options
*
);
extern
void
diff_setup_done
(
struct
diff_options
*
);
#define DIFF_DETECT_RENAME 1
#define DIFF_DETECT_COPY 2
...
...
merge-recursive.c
浏览文件 @
738c2187
...
...
@@ -493,8 +493,7 @@ static struct string_list *get_renames(struct merge_options *o,
opts
.
rename_score
=
o
->
rename_score
;
opts
.
show_rename_progress
=
o
->
show_rename_progress
;
opts
.
output_format
=
DIFF_FORMAT_NO_OUTPUT
;
if
(
diff_setup_done
(
&
opts
)
<
0
)
die
(
"diff setup failed"
);
diff_setup_done
(
&
opts
);
diff_tree_sha1
(
o_tree
->
object
.
sha1
,
tree
->
object
.
sha1
,
""
,
&
opts
);
diffcore_std
(
&
opts
);
if
(
opts
.
needed_rename_limit
>
o
->
needed_rename_limit
)
...
...
notes-merge.c
浏览文件 @
738c2187
...
...
@@ -126,8 +126,7 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
diff_setup
(
&
opt
);
DIFF_OPT_SET
(
&
opt
,
RECURSIVE
);
opt
.
output_format
=
DIFF_FORMAT_NO_OUTPUT
;
if
(
diff_setup_done
(
&
opt
)
<
0
)
die
(
"diff_setup_done failed"
);
diff_setup_done
(
&
opt
);
diff_tree_sha1
(
base
,
remote
,
""
,
&
opt
);
diffcore_std
(
&
opt
);
...
...
@@ -190,8 +189,7 @@ static void diff_tree_local(struct notes_merge_options *o,
diff_setup
(
&
opt
);
DIFF_OPT_SET
(
&
opt
,
RECURSIVE
);
opt
.
output_format
=
DIFF_FORMAT_NO_OUTPUT
;
if
(
diff_setup_done
(
&
opt
)
<
0
)
die
(
"diff_setup_done failed"
);
diff_setup_done
(
&
opt
);
diff_tree_sha1
(
base
,
local
,
""
,
&
opt
);
diffcore_std
(
&
opt
);
...
...
patch-ids.c
浏览文件 @
738c2187
...
...
@@ -39,8 +39,7 @@ int init_patch_ids(struct patch_ids *ids)
memset
(
ids
,
0
,
sizeof
(
*
ids
));
diff_setup
(
&
ids
->
diffopts
);
DIFF_OPT_SET
(
&
ids
->
diffopts
,
RECURSIVE
);
if
(
diff_setup_done
(
&
ids
->
diffopts
)
<
0
)
return
error
(
"diff_setup_done failed"
);
diff_setup_done
(
&
ids
->
diffopts
);
return
0
;
}
...
...
revision.c
浏览文件 @
738c2187
...
...
@@ -1855,8 +1855,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
if
(
revs
->
combine_merges
)
revs
->
ignore_merges
=
0
;
revs
->
diffopt
.
abbrev
=
revs
->
abbrev
;
if
(
diff_setup_done
(
&
revs
->
diffopt
)
<
0
)
die
(
"diff_setup_done failed"
);
diff_setup_done
(
&
revs
->
diffopt
);
compile_grep_patterns
(
&
revs
->
grep_filter
);
...
...
submodule.c
浏览文件 @
738c2187
...
...
@@ -574,8 +574,7 @@ static void calculate_changed_submodule_paths(void)
DIFF_OPT_SET
(
&
diff_opts
,
RECURSIVE
);
diff_opts
.
output_format
|=
DIFF_FORMAT_CALLBACK
;
diff_opts
.
format_callback
=
submodule_collect_changed_cb
;
if
(
diff_setup_done
(
&
diff_opts
)
<
0
)
die
(
"diff_setup_done failed"
);
diff_setup_done
(
&
diff_opts
);
diff_tree_sha1
(
parent
->
item
->
object
.
sha1
,
commit
->
object
.
sha1
,
""
,
&
diff_opts
);
diffcore_std
(
&
diff_opts
);
diff_flush
(
&
diff_opts
);
...
...
tree-diff.c
浏览文件 @
738c2187
...
...
@@ -212,8 +212,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
diff_opts
.
rename_score
=
opt
->
rename_score
;
paths
[
0
]
=
NULL
;
diff_tree_setup_paths
(
paths
,
&
diff_opts
);
if
(
diff_setup_done
(
&
diff_opts
)
<
0
)
die
(
"unable to set up diff options to follow renames"
);
diff_setup_done
(
&
diff_opts
);
diff_tree
(
t1
,
t2
,
base
,
&
diff_opts
);
diffcore_std
(
&
diff_opts
);
diff_tree_release_paths
(
&
diff_opts
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录