chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: new-upstream: Fix handling of epochs.
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 3449ec3950ad98064baf6b0736455dfa76c456f9..494452961245577de4454e9984f4d0473bd0fadc 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-1177,7
+1177,8
@@
sub cmd_new_upstream () {
if ($new_version->is_native()) {
$new_version = (new Dpkg::Version "$spec_version-1", check => 1);
}
if ($new_version->is_native()) {
$new_version = (new Dpkg::Version "$spec_version-1", check => 1);
}
- my $new_upstream_version = $new_version->version();
+ my $new_upstream_version = "$new_version";
+ $new_upstream_version =~ s/-.*?$//;;
my $new_upstream = shift @ARGV;
if (!defined $new_upstream) {
my $new_upstream = shift @ARGV;
if (!defined $new_upstream) {