Reverse commit 9876a650 - return the first line from git describe

Also modify the "publish" to strip the output of git describe.

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

diff --git a/stgit/commands/publish.py b/stgit/commands/publish.py
index 56dfd3f64b87fe2def079b1532df37705a94c051..9af89e11b732d9dbd5bb449cec9a211bb868d6e4 100644 (file)
--- a/stgit/commands/publish.py
+++ b/stgit/commands/publish.py
@@ -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:
     # 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,
                                         utils.strip_prefix('refs/heads/',
                                                            public_ref))
         public_head = __create_commit(repository, stack.head.data.tree,

diff --git a/stgit/lib/git.py b/stgit/lib/git.py
index bf8be91369c9791208d9a9b0743015952f84c831..6e3bb4fb2c912b8804064b949eae0d334339866b 100644 (file)
--- a/stgit/lib/git.py
+++ b/stgit/lib/git.py
@@ -617,7 +617,7 @@ class Repository(RunWithEnv):
     def describe(self, commit):
         """Use git describe --all on the given commit."""
         return self.run(['git', 'describe', '--all', commit.sha1]
     def describe(self, commit):
         """Use git describe --all on the given commit."""
         return self.run(['git', 'describe', '--all', commit.sha1]

-                       ).discard_stderr().discard_exitcode().output_one_line()
+                       ).discard_stderr().discard_exitcode().raw_output()

     def simple_merge(self, base, ours, theirs):
         index = self.temp_index()
         try:
     def simple_merge(self, base, ours, theirs):
         index = self.temp_index()
         try: