diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-10-17 18:29:47 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2020-04-01 18:27:59 +0000 |
commit | 58d05a54d52d3e270b25195a70c9afc9aaa72580 (patch) | |
tree | f1c2030eaf2df46f259cb24f3bd2496b5f077e79 /bin/git-gpick | |
parent | 66611106473a8867756c5c905903c74884648407 (diff) | |
download | qtrepotools-58d05a54d52d3e270b25195a70c9afc9aaa72580.tar.gz |
gpush: add option to capture leading loose Changes
we don't automatically capture leading loose Changes because that would
lead to a significant rate of false positives, but the case of
prepending new Changes to a series is common enough to provide a
shortcut for explicit capture (the "verbose" approach is to simply
regroup the series from scratch).
we complain when encountering leading loose Changes but no capture is
requested, to avoid false negatives in turn. however, until the later
introduction of grouping mode this is somewhat annoying, because the
only ways to make it shut up are to a) capture the loose Changes, b)
push them separately right away, or c) rebase them out of the way.
Change-Id: I128999d06561c24b4f9130b9950106aa142ab64d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Diffstat (limited to 'bin/git-gpick')
-rwxr-xr-x | bin/git-gpick | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/git-gpick b/bin/git-gpick index 54639c3..1c51071 100755 --- a/bin/git-gpick +++ b/bin/git-gpick @@ -730,7 +730,7 @@ sub resolve_specs($) } else { my $gid; my $pivot = $commit_by_id{$tip}{change}; - ($range, $gid, undef) = do_determine_series($pivot); + ($range, $gid, undef, undef) = do_determine_series($pivot); wfail("Spec $$spec{orig} points at loose Change(s)." ." Please specify an exact range.\n") if (!defined($gid)); |