OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4291 from matrix-org/rav/disable_pager_in_ci 

Disable pager for ci script
pull/4294/head
Richard van der Hoff 2018-12-11 16:23:49 +01:00 committed by GitHub
parent dece89d280 2755a0d48a
commit 1e2b065112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/merge_base_branch.sh
View File

@ -20,7 +20,7 @@ else
fi fi
# Show what we are before # Show what we are before
git show -s git --no-pager show -s
# Set up username so it can do a merge # Set up username so it can do a merge
git config --global user.email bot@matrix.org git config --global user.email bot@matrix.org
@ -31,4 +31,4 @@ git fetch -u origin $GITBASE
git merge --no-edit origin/$GITBASE git merge --no-edit origin/$GITBASE
# Show what we are after. # Show what we are after.
git show -s git --no-pager show -s

1
changelog.d/4291.misc Normal file
View File

@ -0,0 +1 @@
Disable pager when running git-show in CI