From 2b3b95c17dcead40000114a49736f385b8a5fea0 Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Mon, 8 May 2017 04:00:43 -0700 Subject: [PATCH] more --- merge-to-win-ci | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/merge-to-win-ci b/merge-to-win-ci index d7d5e9e55..5894158ff 100755 --- a/merge-to-win-ci +++ b/merge-to-win-ci @@ -1,10 +1,10 @@ #!/bin/bash doit() { - git checkout master-win-ci || exit 1 - git merge --commit -m 'update' origin/master || exit 1 - git push origin master-win-ci || exit 1 - exit 0 + git checkout master-win-ci || return 1 + git merge --commit -m 'update' origin/master || return 1 + git push origin master-win-ci || return 1 + return 0 } doit || exit 1