diff options
Diffstat (limited to 'git_config.py')
-rw-r--r-- | git_config.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git_config.py b/git_config.py index 6bb92003..56cc6a24 100644 --- a/git_config.py +++ b/git_config.py | |||
@@ -303,10 +303,10 @@ class GitConfig(object): | |||
303 | for line in d.rstrip('\0').split('\0'): # pylint: disable=W1401 | 303 | for line in d.rstrip('\0').split('\0'): # pylint: disable=W1401 |
304 | # Backslash is not anomalous | 304 | # Backslash is not anomalous |
305 | if '\n' in line: | 305 | if '\n' in line: |
306 | key, val = line.split('\n', 1) | 306 | key, val = line.split('\n', 1) |
307 | else: | 307 | else: |
308 | key = line | 308 | key = line |
309 | val = None | 309 | val = None |
310 | 310 | ||
311 | if key in c: | 311 | if key in c: |
312 | c[key].append(val) | 312 | c[key].append(val) |
@@ -431,7 +431,7 @@ def _open_ssh(host, port=None): | |||
431 | '-o','ControlPath %s' % ssh_sock(), | 431 | '-o','ControlPath %s' % ssh_sock(), |
432 | host] | 432 | host] |
433 | if port is not None: | 433 | if port is not None: |
434 | command_base[1:1] = ['-p',str(port)] | 434 | command_base[1:1] = ['-p', str(port)] |
435 | 435 | ||
436 | # Since the key wasn't in _master_keys, we think that master isn't running. | 436 | # Since the key wasn't in _master_keys, we think that master isn't running. |
437 | # ...but before actually starting a master, we'll double-check. This can | 437 | # ...but before actually starting a master, we'll double-check. This can |