typo in merge exception handling #8

ebridges commented 2013年05月10日 18:49:25 +02:00 (Migrated from github.com)

Thanks for a really useful product!

A script in which I'm using gitflow caused this error:

 File "/Users/ebridges/.virtualenvs/irs/lib/python2.7/site-packages/gitflow-0.5.1-py2.7.egg/gitflow/branches.py", line 269, in merge
 text = text + '\n' + e.stderr
UnboundLocalError: local variable 'text' referenced before assignment

This is due to two small spelling typos in branches.py

 except GitCommandError, e:
 txt = stdout.getvalue().rstrip()
 if e.stderr:
 text = text + '\n' + e.stderr
 raise MergeError(txt)

That line should be: txt = txt + '\n' + e.stderr.

Thanks for a really useful product! A script in which I'm using gitflow caused this error: ``` File "/Users/ebridges/.virtualenvs/irs/lib/python2.7/site-packages/gitflow-0.5.1-py2.7.egg/gitflow/branches.py", line 269, in merge text = text + '\n' + e.stderr UnboundLocalError: local variable 'text' referenced before assignment ``` This is due to two small spelling typos in [`branches.py`](https://github.com/htgoebel/gitflow/blob/develop/gitflow/branches.py#L269) ``` python except GitCommandError, e: txt = stdout.getvalue().rstrip() if e.stderr: text = text + '\n' + e.stderr raise MergeError(txt) ``` That line should be: `txt = txt + '\n' + e.stderr`.

htgoebel commented 2013年05月12日 17:10:02 +02:00 (Migrated from github.com)

Fixed in e41537552b. Thanks for reporting.

Fixed in e41537552b. Thanks for reporting.