git: handle newlines in .git files

Closes #213 Reported-by: Jérôme Carretero <cJ@zougloub.eu> Signed-off-by: David Aguilar <davvid@gmail.com>
git-cola · Dec 9, 2013 · 1d2d7e1 · 1d2d7e1
1 parent 55b8b37
commit 1d2d7e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cola/git.py b/cola/git.py
@@ -44,7 +44,7 @@ def read_git_file(path):
     if path is None:
         return None
     if is_git_file(path):
-        data = core.read(path)
+        data = core.read(path).strip()
         if data.startswith('gitdir: '):
             return data[len('gitdir: '):]
     return None

diff --git a/share/doc/git-cola/thanks.rst b/share/doc/git-cola/thanks.rst
@@ -24,6 +24,7 @@ Thanks
 * Iulian Udrea
 * Ivar Smolin
 * Jakub Wilk
+* Jérôme Carretero
 * Johann Schmitz
 * Jeff Dagenais
 * Justin Lecher