Commit 04ccb908 authored by Vitaly Lipatov's avatar Vitaly Lipatov

small fixes

parent 5ec21645
...@@ -79,7 +79,7 @@ case "$COMMAND" in ...@@ -79,7 +79,7 @@ case "$COMMAND" in
"add"|"del") "add"|"del")
[ -n "$PARAM" ] || fatal "Param for command is missed" [ -n "$PARAM" ] || fatal "Param for command is missed"
echo "$GIRARHOST:$BINARYREPO ACL for $PROJECTNAME: $COMMAND $PARAM..." echo "$GIRARHOST:$BINARYREPO ACL for $PROJECTNAME: $COMMAND $PARAM..."
ssh $GIRARHOST acl $BINARYREPO $PROJECTNAME $COMMAND $PARAM docmd ssh $GIRARHOST acl $BINARYREPO $PROJECTNAME $COMMAND $PARAM
;; ;;
"show") "show")
echo -n "$GIRARHOST:$BINARYREPO ACL for " echo -n "$GIRARHOST:$BINARYREPO ACL for "
......
...@@ -29,7 +29,7 @@ if [ "$1" = "-a" ] ; then ...@@ -29,7 +29,7 @@ if [ "$1" = "-a" ] ; then
fi fi
if [ "$1" = "-c" ] ; then if [ "$1" = "-c" ] ; then
CHECKONLY=1 CHECKRESULT=1
shift shift
fi fi
...@@ -76,7 +76,7 @@ REMOTEBRANCH="$2" ...@@ -76,7 +76,7 @@ REMOTEBRANCH="$2"
# use current branch name as default # use current branch name as default
[ -n "$REMOTEBRANCH" ] || REMOTEBRANCH=$(get_current_branch) [ -n "$REMOTEBRANCH" ] || REMOTEBRANCH=$(get_current_branch)
if [ -n "$CHECKONLY" ] ; then if [ -n "$CHECKRESULT" ] ; then
# Quiet in check mode # Quiet in check mode
#showcmd git pull --rebase $REPO $REMOTEBRANCH #showcmd git pull --rebase $REPO $REMOTEBRANCH
UPTODATEres=`git pull --rebase $REPO $REMOTEBRANCH 2>&1` UPTODATEres=`git pull --rebase $REPO $REMOTEBRANCH 2>&1`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment