Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
b71ce7f3
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,发现更多精彩内容 >>
提交
b71ce7f3
编写于
5月 27, 2008
作者:
J
Junio C Hamano
浏览文件
操作
浏览文件
下载
差异文件
Merge 1.5.5.3 in
上级
37b78c25
28bc3022
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
24 addition
and
18 deletion
+24
-18
Documentation/RelNotes-1.5.5.3.txt
Documentation/RelNotes-1.5.5.3.txt
+12
-0
Documentation/git-bundle.txt
Documentation/git-bundle.txt
+1
-1
Documentation/git.txt
Documentation/git.txt
+2
-1
builtin-commit.c
builtin-commit.c
+2
-0
git-filter-branch.sh
git-filter-branch.sh
+1
-1
gitweb/gitweb.perl
gitweb/gitweb.perl
+4
-4
t/t7003-filter-branch.sh
t/t7003-filter-branch.sh
+2
-11
未找到文件。
Documentation/RelNotes-1.5.5.3.txt
0 → 100644
浏览文件 @
b71ce7f3
GIT v1.5.5.3 Release Notes
==========================
Fixes since v1.5.5.2
--------------------
* "git send-email --compose" did not notice that non-ascii contents
needed some MIME magic.
* "git fast-export" did not export octopus merges correctly.
Also comes with various documentation updates.
Documentation/git-bundle.txt
浏览文件 @
b71ce7f3
...
...
@@ -9,7 +9,7 @@ git-bundle - Move objects and refs by archive
SYNOPSIS
--------
[verse]
'git-bundle' create <file>
[git-rev-list args]
'git-bundle' create <file>
<git-rev-list args>
'git-bundle' verify <file>
'git-bundle' list-heads <file> [refname...]
'git-bundle' unbundle <file> [refname...]
...
...
Documentation/git.txt
浏览文件 @
b71ce7f3
...
...
@@ -46,11 +46,12 @@ Documentation for older releases are available here:
* link:v1.5.5/git.html[documentation for release 1.5.5]
* release notes for
link:RelNotes-1.5.5.3.txt[1.5.5.3],
link:RelNotes-1.5.5.2.txt[1.5.5.2],
link:RelNotes-1.5.5.1.txt[1.5.5.1],
link:RelNotes-1.5.5.txt[1.5.5].
* link:v1.5.5.
2/git.html[documentation for release 1.5.5.2
]
* link:v1.5.5.
3/git.html[documentation for release 1.5.5.3
]
* link:v1.5.4.5/git.html[documentation for release 1.5.4.5]
...
...
builtin-commit.c
浏览文件 @
b71ce7f3
...
...
@@ -223,6 +223,8 @@ static char *prepare_index(int argc, const char **argv, const char *prefix)
if
(
interactive
)
{
interactive_add
(
argc
,
argv
,
prefix
);
if
(
read_cache
()
<
0
)
die
(
"index file corrupt"
);
commit_style
=
COMMIT_AS_IS
;
return
get_index_file
();
}
...
...
git-filter-branch.sh
浏览文件 @
b71ce7f3
...
...
@@ -234,7 +234,7 @@ case "$filter_subdir" in
;;
*
)
git rev-list
--reverse
--topo-order
--default
HEAD
\
--parents
--full-history
"
$@
"
--
"
$filter_subdir
"
--parents
"
$@
"
--
"
$filter_subdir
"
esac
>
../revs
||
die
"Could not get the commits"
commits
=
$(
wc
-l
<../revs |
tr
-d
" "
)
...
...
gitweb/gitweb.perl
浏览文件 @
b71ce7f3
...
...
@@ -2756,7 +2756,7 @@ sub git_print_page_nav {
}
sub format_paging_nav {
my ($action, $hash, $head, $page, $
nrevs
) = @_;
my ($action, $hash, $head, $page, $
has_next_link
) = @_;
my $paging_nav;
...
...
@@ -2774,7 +2774,7 @@ sub format_paging_nav {
$paging_nav .= "
⋅
prev";
}
if ($
nrevs >= (100 * ($page+1)-1)
) {
if ($
has_next_link
) {
$paging_nav .= "
⋅
" .
$cgi->a({-href => href(-replay=>1, page=>$page+1),
-accesskey => "n", -title => "Alt-n"}, "next");
...
...
@@ -4665,7 +4665,7 @@ sub git_log {
my @commitlist = parse_commits($hash, 101, (100 * $page));
my $paging_nav = format_paging_nav('log', $hash, $head, $page,
(100 * ($page+1))
);
my $paging_nav = format_paging_nav('log', $hash, $head, $page,
$#commitlist >= 100
);
git_header_html();
git_print_page_nav('log','', $hash,undef,undef, $paging_nav);
...
...
@@ -5585,7 +5585,7 @@ sub git_shortlog {
my @commitlist = parse_commits($hash, 101, (100 * $page));
my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page,
(100 * ($page+1))
);
my $paging_nav = format_paging_nav('shortlog', $hash, $head, $page,
$#commitlist >= 100
);
my $next_link = '';
if ($#commitlist >= 100) {
$next_link =
...
...
t/t7003-filter-branch.sh
浏览文件 @
b71ce7f3
...
...
@@ -97,7 +97,7 @@ test_expect_success 'subdirectory filter result looks okay' '
test_must_fail git show sub:subdir
'
test_expect_success
'
setup and filter history that requires --full-history
'
'
test_expect_success
'
more setup
'
'
git checkout master &&
mkdir subdir &&
echo A > subdir/new &&
...
...
@@ -107,16 +107,7 @@ test_expect_success 'setup and filter history that requires --full-history' '
git rm a &&
test_tick &&
git commit -m "again subdir on master" &&
git merge branch &&
git branch sub-master &&
git-filter-branch -f --subdirectory-filter subdir sub-master
'
test_expect_success
'subdirectory filter result looks okay'
'
test 3 = $(git rev-list -1 --parents sub-master | wc -w) &&
git show sub-master^:new &&
git show sub-master^2:new &&
test_must_fail git show sub:subdir
git merge branch
'
test_expect_success
'use index-filter to move into a subdirectory'
'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录