git - Check to make sure on up to date master in bash script -

-

i trying write function in bash script check make sure files rsynced part of script date master copy git. found this question seemed cover situation. maybe have misunderstood should doesn't seem work hoped.

i have noticed if make commit on separate branch, , merge in master, when change bask master , forget pull (which forget do) script doesn't notice behind master , allows rsync. can advise why function doesn't work hoped?

startup_check()  {     # check make sure on master branch     currentbranch=$(git status|awk 'nr==1{print $3}')      if [ ! "$currentbranch" == "master" ];         echo -e "not on master - cannot proceed, please change master using:\ngit checkout master"         exit 1     fi        # check whether current working branch ahead, behind or diverged remote master, , exit if we're not using current remote master     local=$(git rev-parse @)     remote=$(git rev-parse @{u})     base=$(git merge-base @ @{u})      if [ "$local" == "$remote" ];         echo "working branch up-to-date remote master, proceeding...."     elif [ "$local" == "$base" ];         echo -e "your working branch behind remote branch, need run:\ngit pull"         exit 1     elif [ "$remote" == "$base" ];         echo -e "your working branch ahead of remote branch, need run:\ngit push origin master"         exit 1     else         echo "your working branch has diverged remote master, cannot continue"         exit 1     fi   }

i'm using git-2.6.2 , bash-4.2

from comment on op had @ code in git-bash-completion code. looking think original code may have worked if add a git fetch in method.

however, have written following wanted, i've tested works if you're not on master , if there remote changes aren't reflected locally, , believe other parts work:

startup_check()  {   # need git fecth first download remote changes compare against   git fetch   # of code taken __git_ps1_changes method of https://github.com/markgandolfo/git-bash-completion   local branch_ref   branch_ref="$(git symbolic-ref -q head 2>/dev/null)";   if [ -n "$branch_ref" ];     local branch_origin     branch_origin="$(git for-each-ref --format='%(upstream:short)' $branch_ref)";     if [ -n "$branch_origin" ];       local branch       branch=${branch_ref##refs/heads/};        if [ "$branch" != "master" ];         echo "not working on master - cannot proceed"         exit 1       fi        local unpush       unpush=$(git rev-list $branch_origin..$branch --count);       local unpull       unpull=$(git rev-list $branch..$branch_origin --count);       local staged       staged=$(git diff --staged --name-status | wc -l);       local uncommits       uncommits=$(git status -s -uall --porcelain);        if [[ $unpush -gt 0 ]];         echo "there changes have not been pushed - cannot proceed. following commits need pushed:"         local unpushed         unpushed=$(git rev-list $branch_origin..$branch);         commit in $unpushed;           git --no-pager log --pretty=format:"%h - %an, %ar : %s" -n 1 $commit         done         exit 1       fi        if [[ $unpull -gt 0 ]];         echo "there changes have not been pulled - cannot proceed. following commits have been added master since last pull:"         local unpulled         unpulled=$(git rev-list $branch..$branch_origin);         commit in $unpulled;           git --no-pager log --pretty=format:"%h - %an, %ar : %s" -n 1 $commit         done         exit 1       fi        if [[ $staged -gt 0 ]];         local staging         staging=$(git diff --staged --name-status);         echo "there changes staged have been commited - cannot proceed"         echo $staging         exit 1       fi        local unstaged       unstaged=$(echo "$uncommits" | grep -c "^ [a-z]");       if [[ $unstaged -gt 0 ]];         echo "there unstaged changes - cannot proceed"         echo $(echo "$uncommits" | grep "^ [a-z]")         exit 1       fi        local untracked       untracked=$(echo "$uncommits" | grep -c "^??");       if [[ $untracked -gt 0 ]];         echo "there untracked changes - cannot proceed"         echo $(echo "$uncommits" | grep "^??")         exit 1       fi     fi   else     echo "working folder isn't git folder"     exit 1   fi }

Comments

Post a Comment

Popular posts from this blog

ruby - Trying to change last to "x"s to 23 -

-
i have been playing around irb , have string looks this: irb(main):072:0> puts ["[\"4354 5432 5432 xxxxx\", \"6547 6547 8543 xxxxx\", \"2344 6543 6674 xxxxx\", \"2346 6236 7543 xxxxx\", \"1273 5585 5587 xxxxx\"]"] => nil irb(main):073:0> what want gsub last 2 "x" s of each 17 digit combination, 23 . what i've tried far (i've been using rubular): a.gsub(/\d[x]/,"23") <= grabs "x" s i'm close a.gsub(/\w[x{2}]/,"23") <= grabs "x" s grabs two digits each combination. is there easier way i'm not understanding? a.gsub(/\d{4} \d{4} \d{4} xxx\kxx/, '23') \d{4} = 4 digits what \k drop matched far. can use don't replace entire number, still able validate have in desired format.
Read more

jquery - Clone last and append item to closest class -

-
this bare-bones code on page: <div class="list-container"> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> </div> <p><button class="add-list-item">add</button></p> <div class="list-container"> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> <div class="single-list-item"> <button>remove</button> </div> </div> <p><button class="add-list-item">add</button></p> <di...
Read more

css - Can I use the :after pseudo-element on an input field? -

-
i trying use :after css pseudo-element on input field, not work. if use span , works ok. <style type="text/css"> .mystyle:after {content:url(smiley.gif);} .mystyle {color:red;} </style> this works (puts smiley after "buu!" , before "some more") <span class="mystyle">buuu!</span>a more this not work - colors somevalue in red, there no smiley. <input class="mystyle" type="text" value="somevalue"> what doing wrong? should use pseudo-selector? note: cannot add span around input , because being generated third-party control. :after , :before not supported in internet explorer 7 , under, on elements. it's not meant used on replaced elements such form elements (inputs) , image elements . in other words it's impossible pure css. however if using jquery can use $(".mystyle").after("add smiley here"); api docs on .after to ...
Read more