diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-18 14:16:41 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:06:59 +0100 |
commit | a87e08ae2e6861e87a386dd5c621e3da9c5d41d1 (patch) | |
tree | cdc72eff7a2888c0eca809316222f3fb09b90063 /git-debrebase | |
parent | 019f49c1c81145e61b1e066efe937e93e64fee7d (diff) |
git-debrebase: new-upstream-v0: allow upstream to be omitted
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-debrebase b/git-debrebase index 8e47251..2b38d4f 100755 --- a/git-debrebase +++ b/git-debrebase @@ -22,9 +22,9 @@ # usages: # # git-debrebase [<options>] new-upstream-v0 \ -# <new-version> <orig-commitish> \ +# <new-version> [<orig-commitish> \ # [<extra-orig-name> <extra-orig-commitish> ...] \ -# [<git-rebase options>...] +# [<git-rebase options>...]] # # git-debrebase [<options> --] [<git-rebase options...>] # git-debrebase [<options>] analyse @@ -1025,13 +1025,13 @@ sub cmd_new_upstream_v0 () { my %pieces; - badusage "need NEW-VERSION UPS-COMMITTISH" unless @ARGV >= 2; + badusage "need NEW-VERSION [UPS-COMMITTISH]" unless @ARGV >= 1; # parse args - low commitment my $new_version = (new Dpkg::Version scalar(shift @ARGV), check => 1); my $new_upstream_version = $new_version->version(); - my $new_upstream = git_rev_parse shift @ARGV; + my $new_upstream = git_rev_parse (shift @ARGV // 'upstream'); record_ffq_auto(); |