#!/bin/bash
if [ -z "$1" ]
then
    echo 'Brak nazwy brancha! Podaj ja jako pierwszy argument!'
else
    {
        cd ias2-igo &&
        echo '############# checkout origin/sync ##############' &&
        git checkout origin/sync
        git branch -D $1-temp
        git reset --hard &&
        echo '############# pull ##############'
        git pull
        git checkout origin/$1 -b $1-temp &&
        echo '############# submodule update ##############' &&
        git submodule update &&
        echo '############# merge --no-ff origin/sync ##############' &&
        git merge --no-ff origin/sync | grep "Already up-to-date." &&
        echo $i &&
        echo 'xx'
#        git merge --no-ff origin/sync &&
#        cd custom &&
#        git checkout origin/dev &&
#        cd .. &&
#        echo '############# add custom ##############' &&
#        git add custom &&
#        echo '############# commit --amend ##############' &&
#        git commit --amend # &&
#        #echo '############# push ##############' &&
#        git push origin HEAD:refs/for/$1
    } || {
        echo 'Blad synchronizacji. Moze lepiej wykonac ja recznie?'
    }
fi












pkrajewski@mars-maks-debian:~/projects/CLEAN$ sh synchro_igo.sh dev-sfx
############# checkout origin/sync ##############
M       custom
Note: checking out 'origin/sync'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD is now at 4f02b7c... Merge branch 'splitpayment' into sync
Deleted branch dev-sfx-temp (was 2b1a577).
HEAD is now at 4f02b7c Merge branch 'splitpayment' into sync
############# pull ##############
You are not currently on a branch. Please specify which
branch you want to merge with. See git-pull(1) for details.

    git pull <remote> <branch>

Previous HEAD position was 4f02b7c... Merge branch 'splitpayment' into sync
Branch dev-sfx-temp set up to track remote branch dev-sfx from origin.
Switched to a new branch 'dev-sfx-temp'
############# submodule update ##############
############# merge --no-ff origin/sync ##############
Blad synchronizacji. Moze lepiej wykonac ja recznie?