зеркало из https://github.com/microsoft/git.git
Merge 1.5.5.3 in
This commit is contained in:
Коммит
b71ce7f3f1
|
@ -0,0 +1,12 @@
|
|||
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.
|
|
@ -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...]
|
||||
|
|
|
@ -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]
|
||||
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -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 " ")
|
||||
|
||||
|
|
|
@ -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 =
|
||||
|
|
|
@ -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' '
|
||||
|
|
Загрузка…
Ссылка в новой задаче