diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2023-03-10 12:12:09 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2024-01-09 16:35:08 +0000 |
| commit | d2c616a6468c16ce44a8a8f8bfdcb2960acb97b0 (patch) | |
| tree | 5b2ecdd190b6757b442c60513da5ca8dd0504c05 | |
| parent | 66bbb6e430b85d14fda97532a605ff59d8f21e17 (diff) | |
gpush: permit base-modifying options with --list-online
it may be useful to test the effect of a rebase without committing to it
yet.
Change-Id: I99bf6c2c6661a08becf04f61c80b361ea6609d93
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rwxr-xr-x | bin/git-gpush | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/git-gpush b/bin/git-gpush index 6e85444..35d21ae 100755 --- a/bin/git-gpush +++ b/bin/git-gpush @@ -145,6 +145,9 @@ Options: Reset the base of a previously pushed series to the local branch's base. Typically used after a conflicted pull. + The base-modifying options may be used with --list-online, but + their effect is not persisted in this case. + --move {new|<range>}[/<from>] After cherry-picking Changes to the current branch, mark the picks as the _only_ source for subsequent pushes of these Changes. @@ -456,8 +459,8 @@ sub parse_arguments(@) if ($series_specific); fail("--list/--list-online is incompatible with push-modifying options.\n") if ($push_specific || (!$list_online && $minimal_override)); - fail("--list/--list-online is incompatible with base-modifying options.\n") - if (defined($ref_base)); + fail("--list is incompatible with base-modifying options.\n") + if (defined($ref_base) && !$list_online); } elsif ($push_all) { fail("--all is incompatible with series-specific options.\n") if ($series_specific); |