[Libreoffice-commits] core.git: Branch 'feature/cib_contract136' - g

[Thorsten Behrens]

 g |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 042e7b5eb9cc18a0089ae01f04786ed616a4d5ec
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Mon Jul 2 18:11:47 2018 +0200

    ./g: don't exit early on ./g checkout -f
    
    Reviewed-on: https://gerrit.libreoffice.org/56822
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 5fce97a58b8f764e35bf98128591c9a89537da05)
    
    Change-Id: I33f54c365bce64ccccfeb1c58fc8e4faddb7ad77
    Reviewed-on: https://gerrit.libreoffice.org/56916
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit dca20728ebe798ada1045ea3dabcb981166e2b9d)

diff --git a/g b/g
index 3d2a37d65723..34ed96545223 100755
--- a/g
+++ b/g
@@ -209,7 +209,7 @@ local module
     git checkout "$@" || return $?
     for cmd in "$@" ; do
 	if [ "$cmd" = "-f" ]; then
-	    return 0
+	    continue
 	elif [ "$cmd" = "-b" ] ; then
 	    create_branch=1
 	elif [ "$create_branch" = "1" ] ; then