Skip to content

Commit 6a5932b

Browse files
committed
Merge #7402: [devtools] github-merge get toplevel dir without extra whitespace
5ed2f16 [devtools] github-merge get toplevel dir without extra whitespace (Andrew C)
2 parents 0893705 + 5ed2f16 commit 6a5932b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

contrib/devtools/github-merge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def main():
165165
# Run test command if configured.
166166
if testcmd:
167167
# Go up to the repository's root.
168-
toplevel = subprocess.check_output([GIT,'rev-parse','--show-toplevel'])
168+
toplevel = subprocess.check_output([GIT,'rev-parse','--show-toplevel']).strip()
169169
os.chdir(toplevel)
170170
if subprocess.call(testcmd,shell=True):
171171
print("ERROR: Running %s failed." % testcmd,file=stderr)

0 commit comments

Comments
 (0)