Add the --reject option to fold

[stgit] / stgit / commands / publish.py

diff --git a/stgit/commands/publish.py b/stgit/commands/publish.py
index 73734287fca3b0a063c1ef51797161a85931e52c..d82991626252ceb3fddeb530628c01251f4add95 100644 (file)
--- a/stgit/commands/publish.py
+++ b/stgit/commands/publish.py
@@ -73,7 +73,7 @@ def __create_commit(repository, tree, parents, options, message = ''):
     cd = git.CommitData(
         tree = tree, parents = parents, message = message,
         author = git.Person.author(), committer = git.Person.committer())
-    cd = common.update_commit_data(cd, options, allow_edit = True)
+    cd = common.update_commit_data(cd, options)
 
     return repository.commit(cd)
 
@@ -110,7 +110,7 @@ def func(parser, options, args):
     # base by setting two parents.
     merge_bases = repository.get_merge_bases(public_head, stack.base)
     if not stack.base in merge_bases:
-        message = 'Merge %s into %s' % (repository.describe(stack.base),
+        message = 'Merge %s into %s' % (repository.describe(stack.base).strip(),
                                         utils.strip_prefix('refs/heads/',
                                                            public_ref))
         public_head = __create_commit(repository, stack.head.data.tree,
@@ -133,7 +133,7 @@ def func(parser, options, args):
             cd = pc.data.set_parent(public_head)
             public_head = repository.commit(cd)
             public_tree = public_head.data.tree
-            out.start('Published new patch "%s"' % p)
+            out.info('Published new patch "%s"' % p)
 
     # create a new commit (only happens if no new patches are detected)
     if public_tree.sha1 != stack.head.data.tree.sha1: