mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'maint' to sync with 1.5.4.4
* maint: GIT 1.5.4.4 ident.c: reword error message when the user name cannot be determined Fix dcommit, rebase when rewriteRoot is in use Really make the LF after reset in fast-import optional
This commit is contained in:
commit
ad416ed433
|
@ -37,10 +37,30 @@ Fixes since v1.5.4.3
|
||||||
* "git revert" did not properly fail when attempting to run with a
|
* "git revert" did not properly fail when attempting to run with a
|
||||||
dirty index.
|
dirty index.
|
||||||
|
|
||||||
Also included are a handful documentation updates.
|
* "git merge --no-commit --no-ff <other>" incorrectly made commits.
|
||||||
|
|
||||||
---
|
* "git merge --squash --no-ff <other>", which is a nonsense combination
|
||||||
exec >/var/tmp/1
|
of options, was not rejected.
|
||||||
echo O=$(git describe maint)
|
|
||||||
O=v1.5.4.3-32-g0f2d447
|
* "git ls-remote" and "git remote show" against an empty repository
|
||||||
git shortlog --no-merges $O..maint
|
failed, instead of just giving an empty result (regression).
|
||||||
|
|
||||||
|
* "git fast-import" did not handle a renamed path whose name needs to be
|
||||||
|
quoted, due to a bug in unquote_c_style() function.
|
||||||
|
|
||||||
|
* "git cvsexportcommit" was confused when multiple files with the same
|
||||||
|
basename needed to be pushed out in the same commit.
|
||||||
|
|
||||||
|
* "git daemon" did not send early errors to syslog.
|
||||||
|
|
||||||
|
* "git log --merge" did not work well with --left-right option.
|
||||||
|
|
||||||
|
* "git svn" promprted for client cert password every time it accessed the
|
||||||
|
server.
|
||||||
|
|
||||||
|
* The reset command in "git fast-import" data stream was documented to
|
||||||
|
end with an optional LF, but it actually required one.
|
||||||
|
|
||||||
|
* "git svn dcommit/rebase" did not honor --rewrite-root option.
|
||||||
|
|
||||||
|
Also included are a handful documentation updates.
|
||||||
|
|
|
@ -160,13 +160,9 @@ Fixes since v1.5.4
|
||||||
All of the fixes in v1.5.4 maintenance series are included in
|
All of the fixes in v1.5.4 maintenance series are included in
|
||||||
this release, unless otherwise noted.
|
this release, unless otherwise noted.
|
||||||
|
|
||||||
* "git-daemon" did not send early errors to syslog.
|
|
||||||
|
|
||||||
* "git-http-push" did not allow deletion of remote ref with the usual
|
* "git-http-push" did not allow deletion of remote ref with the usual
|
||||||
"push <remote> :<branch>" syntax.
|
"push <remote> :<branch>" syntax.
|
||||||
|
|
||||||
* "git-log --merge" did not well work with --left-right option.
|
|
||||||
|
|
||||||
* "git-rebase --abort" did not go back to the right location if
|
* "git-rebase --abort" did not go back to the right location if
|
||||||
"git-reset" was run during the "git-rebase" session.
|
"git-reset" was run during the "git-rebase" session.
|
||||||
|
|
||||||
|
|
|
@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
|
||||||
branch of the `git.git` repository.
|
branch of the `git.git` repository.
|
||||||
Documentation for older releases are available here:
|
Documentation for older releases are available here:
|
||||||
|
|
||||||
* link:v1.5.4.3/git.html[documentation for release 1.5.4.3]
|
* link:v1.5.4.4/git.html[documentation for release 1.5.4.4]
|
||||||
|
|
||||||
* release notes for
|
* release notes for
|
||||||
|
link:RelNotes-1.5.4.4.txt[1.5.4.4],
|
||||||
link:RelNotes-1.5.4.3.txt[1.5.4.3],
|
link:RelNotes-1.5.4.3.txt[1.5.4.3],
|
||||||
link:RelNotes-1.5.4.2.txt[1.5.4.2],
|
link:RelNotes-1.5.4.2.txt[1.5.4.2],
|
||||||
link:RelNotes-1.5.4.1.txt[1.5.4.1],
|
link:RelNotes-1.5.4.1.txt[1.5.4.1],
|
||||||
|
|
|
@ -2291,7 +2291,8 @@ static void cmd_reset_branch(void)
|
||||||
else
|
else
|
||||||
b = new_branch(sp);
|
b = new_branch(sp);
|
||||||
read_next_command();
|
read_next_command();
|
||||||
if (!cmd_from(b) && command_buf.len > 0)
|
cmd_from(b);
|
||||||
|
if (command_buf.len > 0)
|
||||||
unread_command_buf = 1;
|
unread_command_buf = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1540,9 +1540,14 @@ sub find_by_url { # repos_root and, path are optional
|
||||||
$remotes->{$repo_id}->{$_});
|
$remotes->{$repo_id}->{$_});
|
||||||
}
|
}
|
||||||
my $p = $path;
|
my $p = $path;
|
||||||
|
my $rwr = rewrite_root({repo_id => $repo_id});
|
||||||
unless (defined $p) {
|
unless (defined $p) {
|
||||||
$p = $full_url;
|
$p = $full_url;
|
||||||
$p =~ s#^\Q$u\E(?:/|$)## or next;
|
my $z = $u;
|
||||||
|
if ($rwr) {
|
||||||
|
$z = $rwr;
|
||||||
|
}
|
||||||
|
$p =~ s#^\Q$z\E(?:/|$)## or next;
|
||||||
}
|
}
|
||||||
foreach my $f (keys %$fetch) {
|
foreach my $f (keys %$fetch) {
|
||||||
next if $f ne $p;
|
next if $f ne $p;
|
||||||
|
|
2
ident.c
2
ident.c
|
@ -171,7 +171,7 @@ static const char au_env[] = "GIT_AUTHOR_NAME";
|
||||||
static const char co_env[] = "GIT_COMMITTER_NAME";
|
static const char co_env[] = "GIT_COMMITTER_NAME";
|
||||||
static const char *env_hint =
|
static const char *env_hint =
|
||||||
"\n"
|
"\n"
|
||||||
"*** Your name cannot be determined from your system services (gecos).\n"
|
"*** Please tell me who you are.\n"
|
||||||
"\n"
|
"\n"
|
||||||
"Run\n"
|
"Run\n"
|
||||||
"\n"
|
"\n"
|
||||||
|
|
|
@ -869,6 +869,8 @@ zcommits
|
||||||
COMMIT
|
COMMIT
|
||||||
reset refs/tags/O3-2nd
|
reset refs/tags/O3-2nd
|
||||||
from :5
|
from :5
|
||||||
|
reset refs/tags/O3-3rd
|
||||||
|
from :5
|
||||||
INPUT_END
|
INPUT_END
|
||||||
|
|
||||||
cat >expect <<INPUT_END
|
cat >expect <<INPUT_END
|
||||||
|
|
Loading…
Reference in a new issue