Merge pull request #125 from GEOS-ESM/develop

Merge develop into main for release
GEOS-ESM · Nov 12, 2020 · 2ef0081 · 2ef0081
2 parents 0f0859b + 2c1d745
commit 2ef0081
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/mepo.d/cmdline/parser.py b/mepo.d/cmdline/parser.py
@@ -104,6 +104,10 @@ def __diff(self):
             '--name-only',
             action = 'store_true',
             help = 'Show only names of changed files')
+        diff.add_argument(
+            '--staged',
+            action = 'store_true',
+            help = 'Show diff of staged changes')
         diff.add_argument(
             'comp_name',
             metavar = 'comp-name',

diff --git a/mepo.d/repository/git.py b/mepo.d/repository/git.py
@@ -96,6 +96,8 @@ def run_diff(self, args=None):
         cmd = self.__git + ' diff --color'
         if args.name_only:
             cmd += ' --name-only'
+        if args.staged:
+            cmd += ' --staged'
         output = shellcmd.run(cmd.split(),output=True)
         return output.rstrip()