зеркало из https://github.com/microsoft/git.git
git svn: avoid uninitialized var in 'reset'
When "git svn reset" is called with an invalid revision, we bail out and show the user a proper error message instead of giving them a cryptic one related to git-svn internals. ref: http://bugs.debian.org/578908 Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Reported-by: Jens Seidel <jensseidel@users.sf.net> Acked-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Родитель
212f0ba357
Коммит
70ee0b7797
|
@ -1185,6 +1185,7 @@ sub cmd_reset {
|
|||
"history\n";
|
||||
}
|
||||
my ($r, $c) = $gs->find_rev_before($target, not $_fetch_parent);
|
||||
die "Cannot find SVN revision $target\n" unless defined($c);
|
||||
$gs->rev_map_set($r, $c, 'reset', $uuid);
|
||||
print "r$r = $c ($gs->{ref_id})\n";
|
||||
}
|
||||
|
@ -3605,6 +3606,7 @@ sub mkfile {
|
|||
|
||||
sub rev_map_set {
|
||||
my ($self, $rev, $commit, $update_ref, $uuid) = @_;
|
||||
defined $commit or die "missing arg3\n";
|
||||
length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
|
||||
my $db = $self->map_path($uuid);
|
||||
my $db_lock = "$db.lock";
|
||||
|
|
Загрузка…
Ссылка в новой задаче