Do not use the pager when the output is empty

This is for the diff and show commands to not run the output through the
pager if there is nothing to display.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/commands/diff.py b/stgit/commands/diff.py
index caa3c5b3cc352d22c5b13a8020c425968d5987c4..9abd438ae0c259d52fafa80a65184bb5a0aa9c25 100644 (file)
--- a/stgit/commands/diff.py
+++ b/stgit/commands/diff.py
@@ -78,4 +78,6 @@ def func(parser, options, args):
     if options.stat:
         print git.diffstat(args, git_id(rev1), git_id(rev2))
     else:
-        pager(git.diff(args, git_id(rev1), git_id(rev2)))
+        diff_str = git.diff(args, git_id(rev1), git_id(rev2))
+        if diff_str:
+            pager(diff_str)

diff --git a/stgit/commands/show.py b/stgit/commands/show.py
index 95371926178b1fddd36b4f76901bed9cc8d9675f..a3169b90d0148fcc3c4a7cb82d70275d23d529c6 100644 (file)
--- a/stgit/commands/show.py
+++ b/stgit/commands/show.py
@@ -43,4 +43,6 @@ def func(parser, options, args):
         parser.error('incorrect number of arguments')
 
     commit_id = git_id(patch)
-    pager(git.pretty_commit(commit_id))
+    commit_str = git.pretty_commit(commit_id)
+    if commit_str:
+        pager(commit_str)