Merge branch 'stable'

[stgit] / stgit / commands / uncommit.py

diff --git a/stgit/commands/uncommit.py b/stgit/commands/uncommit.py
index eb39fcc0a3ffa4a7004cde22af25f42579a438e2..c21306b4705576e9e0831233db7fb82d4f6b9590 100644 (file)
--- a/stgit/commands/uncommit.py
+++ b/stgit/commands/uncommit.py
@@ -104,9 +104,9 @@ def func(parser, options, args):
             next_commit = get_parent(next_commit)
     else:
         if options.exclusive:
-            out.start('Uncommitting to %s (exclusive)' % to_commit)
+            out.start('Uncommitting to %s (exclusive)' % to_commit.sha1)
         else:
-            out.start('Uncommitting to %s' % to_commit)
+            out.start('Uncommitting to %s' % to_commit.sha1)
         while True:
             if next_commit == to_commit:
                 if not options.exclusive:
@@ -136,5 +136,5 @@ def func(parser, options, args):
     for commit, pn in zip(commits, patchnames):
         trans.patches[pn] = commit
     trans.applied = list(reversed(patchnames)) + trans.applied
-    trans.run()
+    trans.run(set_head = False)
     out.done()