git.pretty_commit() re-implemented with "git show" (bug #10018)

[stgit] / stgit / git.py

diff --git a/stgit/git.py b/stgit/git.py
index 4cc35c9cd13e52c0a03d7da173e675911edd702e..27d2595cec458045e3b3518d2af8a5bec4f8f091 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -815,13 +815,10 @@ def barefiles(rev1, rev2):
 
     return '\n'.join(result)
 
-def pretty_commit(commit_id = 'HEAD', diff_flags = []):
+def pretty_commit(commit_id = 'HEAD', flags = []):
     """Return a given commit (log + diff)
     """
-    return GRun('diff-tree',
-                *(diff_flags
-                  + ['--cc', '--always', '--pretty', '-r', commit_id])
-                ).raw_output()
+    return GRun('show', *(flags + [commit_id])).raw_output()
 
 def checkout(files = None, tree_id = None, force = False):
     """Check out the given or all files