diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2020-04-17 19:33:54 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2020-04-20 15:12:22 +0000 |
| commit | 95b3891cba8be212f6c8cf82d911c553e7c72d7d (patch) | |
| tree | 83f8b48486d7baa2a7953365d07a89fd2758ee6b /bin | |
| parent | 87fe1acc57b2065b72b44e61d255898984e12fd3 (diff) | |
| download | qtrepotools-95b3891cba8be212f6c8cf82d911c553e7c72d7d.tar.gz | |
gpick: fix dropping locally unpushed Changes which exist on gerrit
amends d252cf0e.
Change-Id: I3de6600f9c3f1fcc052d64aa2dc8d161aab74109
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Diffstat (limited to 'bin')
| -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 c7cda46..d77c991 100755 --- a/bin/git-gpick +++ b/bin/git-gpick @@ -2575,7 +2575,7 @@ sub verify_delete($$$$$$$) # not just the current and the previously pushed one. my $parts = verify_local_commit($lcl_commit, $rmt_commit, $rmt_ps); if ($parts) { - if ($pushed_ps ne "?") { # The PatchSet must be actually still present. + if ($pushed_commit && ($pushed_ps ne "?")) { # The PatchSet must be actually still present. $parts = verify_local_commit($lcl_commit, $pushed_commit, $pushed_ps); if ($parts) { $annot = format_parts($parts)." PS$pushed_ps"; |