diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-25 15:42:11 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-01-25 15:42:16 +0100 |
| commit | 6a5932bf2a4a2e99d35932f021ba2cf87c0fb2c7 (patch) | |
| tree | f6ee91697f74345331c4162b7e68882cd5bdd4b1 | |
| parent | 0893705ebfa66c4997838734208ebf44a773eed7 (diff) | |
| parent | 5ed2f16480142f0887cc1a6257ff53e2abc3e5b6 (diff) | |
Merge #7402: [devtools] github-merge get toplevel dir without extra whitespace
5ed2f16 [devtools] github-merge get toplevel dir without extra whitespace (Andrew C)
| -rwxr-xr-x | contrib/devtools/github-merge.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py index 6854ecb073..f7781cceb3 100755 --- a/contrib/devtools/github-merge.py +++ b/contrib/devtools/github-merge.py @@ -165,7 +165,7 @@ def main(): # Run test command if configured. if testcmd: # Go up to the repository's root. - toplevel = subprocess.check_output([GIT,'rev-parse','--show-toplevel']) + toplevel = subprocess.check_output([GIT,'rev-parse','--show-toplevel']).strip() os.chdir(toplevel) if subprocess.call(testcmd,shell=True): print("ERROR: Running %s failed." % testcmd,file=stderr) |