Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
f44bc33c
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,发现更多精彩内容 >>
提交
f44bc33c
编写于
8月 06, 2008
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Sync with 1.5.6.5
上级
d96ca27e
781c1834
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
80 addition
and
15 deletion
+80
-15
Documentation/RelNotes-1.5.6.5.txt
Documentation/RelNotes-1.5.6.5.txt
+3
-6
Documentation/git-diff-tree.txt
Documentation/git-diff-tree.txt
+3
-3
Documentation/git.txt
Documentation/git.txt
+2
-1
builtin-commit.c
builtin-commit.c
+7
-4
builtin-tag.c
builtin-tag.c
+2
-1
parse-options.c
parse-options.c
+12
-0
parse-options.h
parse-options.h
+2
-0
t/t7004-tag.sh
t/t7004-tag.sh
+20
-0
t/t7500-commit.sh
t/t7500-commit.sh
+29
-0
未找到文件。
Documentation/RelNotes-1.5.6.5.txt
浏览文件 @
f44bc33c
...
...
@@ -6,6 +6,9 @@ Fixes since v1.5.6.4
* "git cvsimport" used to spit out "UNKNOWN LINE..." diagnostics to stdout.
* "git commit -F filename" and "git tag -F filename" run from subdirectories
did not read the right file.
* "git init --template=" with blank "template" parameter linked files
under root directories to .git, which was a total nonsense. Instead, it
means "I do not want to use anything from the template directory".
...
...
@@ -24,9 +27,3 @@ Fixes since v1.5.6.4
header properly.
Contains other various documentation fixes.
--
exec >/var/tmp/1
echo O=$(git describe maint)
O=v1.5.6.4-26-g2b6ca6d
git shortlog --no-merges $O..maint
Documentation/git-diff-tree.txt
浏览文件 @
f44bc33c
...
...
@@ -49,13 +49,13 @@ include::diff-options.txt[]
--stdin::
When '--stdin' is specified, the command does not take
<tree-ish> arguments from the command line. Instead, it
reads either one <commit> or a
pair of <tree-ish
>
reads either one <commit> or a
list of <commit
>
separated with a single space from its standard input.
+
When a single commit is given on one line of such input, it compares
the commit with its parents. The following flags further affects its
behavior. Th
is does not apply to the case where two <tree-ish>
separated with a single space are given
.
behavior. Th
e remaining commits, when given, are used as if they are
parents of the first commit
.
-m::
By default, 'git-diff-tree --stdin' does not show
...
...
Documentation/git.txt
浏览文件 @
f44bc33c
...
...
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
* link:v1.5.6.
4/git.html[documentation for release 1.5.6.4
]
* link:v1.5.6.
5/git.html[documentation for release 1.5.6.5
]
* release notes for
link:RelNotes-1.5.6.5.txt[1.5.6.5],
link:RelNotes-1.5.6.4.txt[1.5.6.4],
link:RelNotes-1.5.6.3.txt[1.5.6.3],
link:RelNotes-1.5.6.2.txt[1.5.6.2],
...
...
builtin-commit.c
浏览文件 @
f44bc33c
...
...
@@ -46,7 +46,7 @@ static enum {
COMMIT_PARTIAL
,
}
commit_style
;
static
char
*
logfile
,
*
force_author
;
static
c
onst
c
har
*
logfile
,
*
force_author
;
static
const
char
*
template_file
;
static
char
*
edit_message
,
*
use_message
;
static
char
*
author_name
,
*
author_email
,
*
author_date
;
...
...
@@ -711,11 +711,14 @@ static int message_is_empty(struct strbuf *sb, int start)
}
static
int
parse_and_validate_options
(
int
argc
,
const
char
*
argv
[],
const
char
*
const
usage
[])
const
char
*
const
usage
[],
const
char
*
prefix
)
{
int
f
=
0
;
argc
=
parse_options
(
argc
,
argv
,
builtin_commit_options
,
usage
,
0
);
logfile
=
parse_options_fix_filename
(
prefix
,
logfile
);
template_file
=
parse_options_fix_filename
(
prefix
,
template_file
);
if
(
logfile
||
message
.
len
||
use_message
)
use_editor
=
0
;
...
...
@@ -836,7 +839,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
if
(
wt_status_use_color
==
-
1
)
wt_status_use_color
=
git_use_color_default
;
argc
=
parse_and_validate_options
(
argc
,
argv
,
builtin_status_usage
);
argc
=
parse_and_validate_options
(
argc
,
argv
,
builtin_status_usage
,
prefix
);
index_file
=
prepare_index
(
argc
,
argv
,
prefix
);
...
...
@@ -929,7 +932,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
git_config
(
git_commit_config
,
NULL
);
argc
=
parse_and_validate_options
(
argc
,
argv
,
builtin_commit_usage
);
argc
=
parse_and_validate_options
(
argc
,
argv
,
builtin_commit_usage
,
prefix
);
index_file
=
prepare_index
(
argc
,
argv
,
prefix
);
...
...
builtin-tag.c
浏览文件 @
f44bc33c
...
...
@@ -346,7 +346,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
int
annotate
=
0
,
sign
=
0
,
force
=
0
,
lines
=
0
,
list
=
0
,
delete
=
0
,
verify
=
0
;
char
*
msgfile
=
NULL
,
*
keyid
=
NULL
;
c
onst
c
har
*
msgfile
=
NULL
,
*
keyid
=
NULL
;
struct
msg_arg
msg
=
{
0
,
STRBUF_INIT
};
struct
option
options
[]
=
{
OPT_BOOLEAN
(
'l'
,
NULL
,
&
list
,
"list tag names"
),
...
...
@@ -372,6 +372,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
git_config
(
git_tag_config
,
NULL
);
argc
=
parse_options
(
argc
,
argv
,
options
,
git_tag_usage
,
0
);
msgfile
=
parse_options_fix_filename
(
prefix
,
msgfile
);
if
(
keyid
)
{
sign
=
1
;
...
...
parse-options.c
浏览文件 @
f44bc33c
...
...
@@ -483,3 +483,15 @@ int parse_opt_approxidate_cb(const struct option *opt, const char *arg,
*
(
unsigned
long
*
)(
opt
->
value
)
=
approxidate
(
arg
);
return
0
;
}
/*
* This should really be OPTION_FILENAME type as a part of
* parse_options that take prefix to do this while parsing.
*/
extern
const
char
*
parse_options_fix_filename
(
const
char
*
prefix
,
const
char
*
file
)
{
if
(
!
file
||
!
prefix
||
is_absolute_path
(
file
)
||
!
strcmp
(
"-"
,
file
))
return
file
;
return
prefix_filename
(
prefix
,
strlen
(
prefix
),
file
);
}
parse-options.h
浏览文件 @
f44bc33c
...
...
@@ -159,4 +159,6 @@ extern int parse_opt_approxidate_cb(const struct option *, const char *, int);
"use <n> digits to display SHA-1s", \
PARSE_OPT_OPTARG, &parse_opt_abbrev_cb, 0 }
extern
const
char
*
parse_options_fix_filename
(
const
char
*
prefix
,
const
char
*
file
);
#endif
t/t7004-tag.sh
浏览文件 @
f44bc33c
...
...
@@ -1070,4 +1070,24 @@ test_expect_success \
test_cmp expect actual
'
test_expect_success
'filename for the message is relative to cwd'
'
mkdir subdir &&
echo "Tag message in top directory" >msgfile-5 &&
echo "Tag message in sub directory" >subdir/msgfile-5 &&
(
cd subdir &&
git tag -a -F msgfile-5 tag-from-subdir
) &&
git cat-file tag tag-from-subdir | grep "in sub directory"
'
test_expect_success
'filename for the message is relative to cwd'
'
echo "Tag message in sub directory" >subdir/msgfile-6 &&
(
cd subdir &&
git tag -a -F msgfile-6 tag-from-subdir-2
) &&
git cat-file tag tag-from-subdir-2 | grep "in sub directory"
'
test_done
t/t7500-commit.sh
浏览文件 @
f44bc33c
...
...
@@ -138,4 +138,33 @@ test_expect_success '--signoff' '
diff expect output
'
test_expect_success
'commit message from file (1)'
'
mkdir subdir &&
echo "Log in top directory" >log &&
echo "Log in sub directory" >subdir/log &&
(
cd subdir &&
git commit --allow-empty -F log
) &&
commit_msg_is "Log in sub directory"
'
test_expect_success
'commit message from file (2)'
'
rm -f log &&
echo "Log in sub directory" >subdir/log &&
(
cd subdir &&
git commit --allow-empty -F log
) &&
commit_msg_is "Log in sub directory"
'
test_expect_success
'commit message from stdin'
'
(
cd subdir &&
echo "Log with foo word" | git commit --allow-empty -F -
) &&
commit_msg_is "Log with foo word"
'
test_done
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录