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: