diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-12 12:23:49 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-12 12:57:13 +0200 |
commit | fd0a5c4040c831a4d2cf4bf1af6b30c94dc3099c (patch) | |
tree | 7f5d7a1d83a285647392b89e9f0069da4dcebd9c /bin/git-qt-merge-mainlines | |
parent | 0b18b2de3df185e972e768317fc0acffc29c519e (diff) |
Fix --list-modules arg to do as advertised
Change-Id: I26aba3b0ce6f218c566051d8f4118c7e93f4ac84
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'bin/git-qt-merge-mainlines')
-rwxr-xr-x | bin/git-qt-merge-mainlines | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/git-qt-merge-mainlines b/bin/git-qt-merge-mainlines index 106f226..8413786 100755 --- a/bin/git-qt-merge-mainlines +++ b/bin/git-qt-merge-mainlines @@ -152,6 +152,7 @@ def merge(module, config): def process_modules(config): if config.list_modules: print("Modules: ", config.modules) + return; manual_merges = [] @@ -213,7 +214,7 @@ if __name__== "__main__": logging.basicConfig(format='%(levelname)s: %(message)s') print("Qt Project merge tool") - if not config.status and not config.merge and not config.reset and not len(config.version): + 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: process_modules(config) |