зеркало из https://github.com/microsoft/git.git
git-svn: error out from dcommit on a parent-less commit
dcommit would unconditionally append "~1" to a commit in order to generate a diff. Now we generate a meaningful error message if we try to generate an impossible diff. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Родитель
0ea865ce7a
Коммит
48d044b5fe
|
@ -589,6 +589,13 @@ sub dcommit {
|
|||
chomp(my @refs = safe_qx(qw/git-rev-list --no-merges/, "$gs..HEAD"));
|
||||
my $last_rev;
|
||||
foreach my $d (reverse @refs) {
|
||||
if (quiet_run('git-rev-parse','--verify',"$d~1") != 0) {
|
||||
die "Commit $d\n",
|
||||
"has no parent commit, and therefore ",
|
||||
"nothing to diff against.\n",
|
||||
"You should be working from a repository ",
|
||||
"originally created by git-svn\n";
|
||||
}
|
||||
unless (defined $last_rev) {
|
||||
(undef, $last_rev, undef) = cmt_metadata("$d~1");
|
||||
unless (defined $last_rev) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче