From a1f9568e4d71021c703a6130edac4895ac566258 Mon Sep 17 00:00:00 2001 From: Thomas Bonfort Date: Wed, 4 Apr 2012 13:55:15 +0200 Subject: [PATCH] correct test for git merge return value --- stablemerge.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/stablemerge.sh b/stablemerge.sh index b32243efd3..4f007b62bb 100644 --- a/stablemerge.sh +++ b/stablemerge.sh @@ -1,25 +1,25 @@ #!/bin/bash git checkout branch-5-0 -if $?; then exit; fi +if $? -ne 0; then exit; fi git merge branch-4-10 -if $?; then exit; fi +if $? -ne 0; then exit; fi git checkout branch-5-2 -if $?; then exit; fi +if $? -ne 0; then exit; fi git merge branch-5-0 -if $?; then exit; fi +if $? -ne 0; then exit; fi git checkout branch-5-4 -if $?; then exit; fi +if $? -ne 0; then exit; fi git merge branch-5-2 -if $?; then exit; fi +if $? -ne 0; then exit; fi git checkout branch-5-6 -if $?; then exit; fi +if $? -ne 0; then exit; fi git merge branch-5-4 -if $?; then exit; fi +if $? -ne 0; then exit; fi git checkout branch-6-0 -if $?; then exit; fi +if $? -ne 0; then exit; fi git merge branch-5-6 -if $?; then exit; fi +if $? -ne 0; then exit; fi git checkout master -if $?; then exit; fi +if $? -ne 0; then exit; fi git merge branch-6-0