mirror of
https://github.com/git/git.git
synced 2024-05-10 04:56:07 +02:00
Merge branch 'bk/maint-cvsexportcommit'
* bk/maint-cvsexportcommit: cvsexportcommit: fix for commits that do not have parents
This commit is contained in:
commit
5fb19486e6
|
@ -82,6 +82,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
my $noparent = "0000000000000000000000000000000000000000";
|
||||||
if ($parent) {
|
if ($parent) {
|
||||||
my $found;
|
my $found;
|
||||||
# double check that it's a valid parent
|
# double check that it's a valid parent
|
||||||
|
@ -95,8 +96,10 @@
|
||||||
} else { # we don't have a parent from the cmdline...
|
} else { # we don't have a parent from the cmdline...
|
||||||
if (@parents == 1) { # it's safe to get it from the commit
|
if (@parents == 1) { # it's safe to get it from the commit
|
||||||
$parent = $parents[0];
|
$parent = $parents[0];
|
||||||
} else { # or perhaps not!
|
} elsif (@parents == 0) { # there is no parent
|
||||||
die "This commit has more than one parent -- please name the parent you want to use explicitly";
|
$parent = $noparent;
|
||||||
|
} else { # cannot choose automatically from multiple parents
|
||||||
|
die "This commit has more than one parent -- please name the parent you want to use explicitly";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -116,7 +119,11 @@
|
||||||
}
|
}
|
||||||
close MSG;
|
close MSG;
|
||||||
|
|
||||||
`git-diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff";
|
if ($parent eq $noparent) {
|
||||||
|
`git-diff-tree --binary -p --root $commit >.cvsexportcommit.diff`;# || die "Cannot diff";
|
||||||
|
} else {
|
||||||
|
`git-diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff";
|
||||||
|
}
|
||||||
|
|
||||||
## apply non-binary changes
|
## apply non-binary changes
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue