Browse Source

Disable pager for ci script

... otherwise it hangs
Richard van der Hoff 5 years ago
parent
commit
2755a0d48a
2 changed files with 3 additions and 2 deletions
  1. 2 2
      .circleci/merge_base_branch.sh
  2. 1 0
      changelog.d/4291.misc

+ 2 - 2
.circleci/merge_base_branch.sh

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

+ 1 - 0
changelog.d/4291.misc

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