From 2755a0d48a6ac290ee54ef402eb6947b0858558d Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Tue, 11 Dec 2018 14:11:30 +0000 Subject: Disable pager for ci script ... otherwise it hangs --- .circleci/merge_base_branch.sh | 4 ++-- changelog.d/4291.misc | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog.d/4291.misc diff --git a/.circleci/merge_base_branch.sh b/.circleci/merge_base_branch.sh index b2c8c40f4c..4c19fa70d7 100755 --- a/.circleci/merge_base_branch.sh +++ b/.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 diff --git a/changelog.d/4291.misc b/changelog.d/4291.misc new file mode 100644 index 0000000000..d3bfe3dd0c --- /dev/null +++ b/changelog.d/4291.misc @@ -0,0 +1 @@ +Disable pager when running git-show in CI \ No newline at end of file -- cgit 1.4.1