Merge branch 'fix-talkative-snapshot'

Brickster · Aug 11, 2015 · a9f9271 · a9f9271
2 parents e8196e9 + 23b2327
commit a9f9271
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/bin/commands/snapshot.py b/bin/commands/snapshot.py
@@ -1,6 +1,7 @@
 """Create a snapshot of the changes in a dirty working directory."""
 
-from subprocess import call, check_output
+import os
+from subprocess import call, check_output, STDOUT
 
 from utils.messages import info
 
@@ -16,6 +17,9 @@ def snapshot(message):
         stash_command = stash_command if message is None else stash_command + [message]
 
         call(stash_command)
-        call(['git', 'stash', 'apply', '--quiet'])
+
+        # apply isn't completely quiet when the stash only contains untracked files so swallow all output
+        with open(os.devnull, 'w') as devnull:
+            call(['git', 'stash', 'apply', '--quiet'], stdout=devnull, stderr=STDOUT)
     else:
         info('No local changes to save. No snapshot created.')