summaryrefslogtreecommitdiff
path: root/git/util.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2011-06-08 01:27:28 +0200
committerSebastian Thiel <byronimo@gmail.com>2011-06-08 01:35:16 +0200
commit90e780a3e16d0c3e4d7288728f6ba36e9c18d736 (patch)
treede5988fc3bb6a39b91cc652e9f6cc51f7015087f /git/util.py
parent58a930a632c867b65b9a3802e2f4190cf32e33ee (diff)
downloadgitpython-90e780a3e16d0c3e4d7288728f6ba36e9c18d736.tar.gz
log: non-existing logs no longer throw an exception, but are ignored. Fixed critical bug which caused packed-ref files to be written with native line endings, which made git fail to parse it. I wonder why I never noticed this before, or ignored it. Unbelievable \!
Diffstat (limited to 'git/util.py')
-rw-r--r--git/util.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/git/util.py b/git/util.py
index 6009e158..d248b1ee 100644
--- a/git/util.py
+++ b/git/util.py
@@ -249,12 +249,15 @@ def join_path(a, *p):
'/' instead of possibly '\' on windows."""
path = a
for b in p:
+ if len(b) == 0:
+ continue
if b.startswith('/'):
path += b[1:]
elif path == '' or path.endswith('/'):
path += b
else:
path += '/' + b
+ # END for each path token to add
return path
def to_native_path_windows(path):