summaryrefslogtreecommitdiff
path: root/bin/git-qt-merge-mainlines
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2016-07-04 16:27:36 +0200
committerEdward Welbourne <edward.welbourne@qt.io>2016-07-05 08:24:13 +0000
commit0536e3428a5c48f35c122a9380340e1999f5da0a (patch)
tree9f3176477d2896ee8169a703e0e62d556b134537 /bin/git-qt-merge-mainlines
parent9ea126374291bfd08e5b4a245dccd57ec33c71d8 (diff)
downloadqtrepotools-0536e3428a5c48f35c122a9380340e1999f5da0a.tar.gz
git-qt-merge-mainlines: reverse a condition to ease reading
Swap the two branches of an if/else clause so that we can test a positive condition that's simpler and easier to read than its negation. Change-Id: I72aa0b6ba7eabfee4d9cb62cc9ff3daa4acafb76 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'bin/git-qt-merge-mainlines')
-rwxr-xr-xbin/git-qt-merge-mainlines6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/git-qt-merge-mainlines b/bin/git-qt-merge-mainlines
index ed0fece..dc33531 100755
--- a/bin/git-qt-merge-mainlines
+++ b/bin/git-qt-merge-mainlines
@@ -256,8 +256,8 @@ sub-modules checked out (e.g. using qt5/init-repository).
logging.basicConfig(format='%(levelname)s: %(message)s')
- if not config.status and not config.merge and not config.reset and not config.list_modules and not len(config.version):
- parser.print_help()
- else:
+ if config.status or config.merge or config.reset or config.list_modules or config.version:
process_modules(config)
+ else:
+ parser.print_help()
print("Submodules that are not checked out and are ignored:\n", ' '.join(modules_not_checked_out))