summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
8b650ae)
The version is in the changelog, and thus upstream commitish can then
be found from as new-upstream.
This also means we now give the same error message, which is much
better than the one we had before.
Closes:#905062.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
with bad syntax.
* git-debrebase test suite: Test messages about unprocessable commits.
* git-debrebase: new-upstream: Fix handling of epochs.
with bad syntax.
* git-debrebase test suite: Test messages about unprocessable commits.
* git-debrebase: new-upstream: Fix handling of epochs.
+ * git-debrebase: convert-from-gbp: Use same algorithm for finding
+ upstream commitish as new-upstream. Closes:#905062.
}
sub cmd_convert_from_gbp () {
}
sub cmd_convert_from_gbp () {
- badusage "needs 1 optional argument, the upstream git rev"
+ badusage "want only 1 optional argument, the upstream git commitish"
+
+ my $clogp = parsechangelog();
+ my $version = $clogp->{'Version'}
+ // die "missing Version from changelog";
+
my ($upstream_spec) = @ARGV;
my ($upstream_spec) = @ARGV;
- $upstream_spec //= 'refs/heads/upstream';
- my $upstream = git_rev_parse $upstream_spec;
+
+ my ($upstream, $upstream_version) =
+ resolve_upstream_version($upstream_spec, $version);
+
my $old_head = get_head();
my $upsdiff = get_differs $upstream, $old_head;
my $old_head = get_head();
my $upsdiff = get_differs $upstream, $old_head;
It is a snag if it is not an ancestor of HEAD,
or if the history between the upstream and HEAD
contains commits which make changes to upstream files.
It is a snag if it is not an ancestor of HEAD,
or if the history between the upstream and HEAD
contains commits which make changes to upstream files.
+If it is not specified,
+the same algorithm is used as for git-debrebase new-upstream.
It is also a snag if the specified upstream
has a debian/ subdirectory.
It is also a snag if the specified upstream
has a debian/ subdirectory.