diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-08-24 20:50:57 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2020-02-28 15:38:21 +0000 |
| commit | 8f35344eacd0b5997e349035c6dc81c375597cd7 (patch) | |
| tree | 208cdeb59c1434ea491da380fffaccc202a4a0ac /bin | |
| parent | 6242b682516bd228dc79af2c750377b43071a487 (diff) | |
| download | qtrepotools-8f35344eacd0b5997e349035c6dc81c375597cd7.tar.gz | |
gpush: complain about unsquashed fixup commits
Change-Id: I5753c98407863a7fb0e263ed8b6631cc7c6ec83c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/git_gpush.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/git_gpush.pm b/bin/git_gpush.pm index bb0ec2b..2daa737 100644 --- a/bin/git_gpush.pm +++ b/bin/git_gpush.pm @@ -676,6 +676,9 @@ sub analyze_local_branch($) my %seen; foreach my $commit (@$commits) { my $subject = $$commit{subject}; + fail("Commit on ".($local_branch // "<detached HEAD>")." was meant to be squashed:\n " + .format_subject($$commit{id}, $subject, -2)."\n") + if ($subject =~ /^(squash|fixup)! /); my $changeid = $$commit{changeid}; my $excommit = $seen{$changeid}; fail("Duplicate Change-Id $changeid on ".($local_branch // "<detached HEAD>").":\n " |