浏览代码

Pipe "git merge -q" output to /dev/null since it's not appropriately quiet in the face of file removals

Tianon Gravi 9 年之前
父节点
当前提交
4182896ba7
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      test-pr.sh

+ 1 - 1
test-pr.sh

@@ -58,7 +58,7 @@ else
 	git config user.name 'nobody'
 	git config user.name 'nobody'
 	git config user.email '[email protected]'
 	git config user.email '[email protected]'
 	git fetch -q origin "pull/$pull/head:pr-$pull"
 	git fetch -q origin "pull/$pull/head:pr-$pull"
-	git merge -q --no-edit "pr-$pull"
+	git merge -q --no-edit "pr-$pull" > /dev/null
 
 
 	commit="$(git log -1 --format=format:%h "pr-$pull")"
 	commit="$(git log -1 --format=format:%h "pr-$pull")"
 fi
 fi