Clean up the --skip-covered pull request.

2 files changed, 12 insertions, 4 deletions

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index f776950a..3e3f7e44 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -63,7 +63,7 @@ class Opts(object):
                 "executed."
         )
     skip_covered = optparse.make_option(
-        '-s', '--skip-covered', action='store_true',
+        '--skip-covered', action='store_true',
         help="Skip files with 100% coverage."
         )
     omit = optparse.make_option(
diff --git a/coverage/summary.py b/coverage/summary.py
index c9877658..33aa017f 100644
--- a/coverage/summary.py
+++ b/coverage/summary.py
@@ -54,9 +54,17 @@ class SummaryReporter(Reporter):
             try:
                 analysis = self.coverage._analyze(cu)
                 nums = analysis.numbers
-                if self.config.skip_covered and nums.n_missing == 0 and \
-                        (not self.branches or nums.n_partial_branches == 0):
-                    continue
+
+                if self.config.skip_covered:
+                    # Don't report on 100% files.
+                    no_missing_lines = (nums.n_missing == 0)
+                    if self.branches:
+                        no_missing_branches = (nums.n_partial_branches == 0)
+                    else:
+                        no_missing_branches = True
+                    if no_missing_lines and no_missing_branches:
+                        continue
+
                 args = (cu.name, nums.n_statements, nums.n_missing)
                 if self.branches:
                     args += (nums.n_branches, nums.n_partial_branches)