Tweaking script to pull all remotes branches

Question

I've started to use one script posted in this another thread:

#!/bin/bash

main() {
  REMOTES="$@";
  if [ -z "$REMOTES" ]; then
    REMOTES=$(git remote);
  fi
  REMOTES=$(echo "$REMOTES" | xargs -n1 echo)
  CLB=$(git branch -l|awk '/^\*/{print $2}');
  echo "$REMOTES" | while read REMOTE; do
    git remote update $REMOTE
    git remote show $REMOTE -n \
    | awk '/merges with remote/{print $5" "$1}' \
    | while read line; do
      RB=$(echo "$line"|cut -f1 -d" ");
      ARB="refs/remotes/$REMOTE/$RB";
      LB=$(echo "$line"|cut -f2 -d" ");
      ALB="refs/heads/$LB";
      NBEHIND=$(( $(git rev-list --count $ALB..$ARB 2>/dev/null) +0));
      NAHEAD=$(( $(git rev-list --count $ARB..$ALB 2>/dev/null) +0));
      if [ "$NBEHIND" -gt 0 ]; then
        if [ "$NAHEAD" -gt 0 ]; then
          echo " branch $LB is $NBEHIND commit(s) behind and $NAHEAD commit(s) ahead of $REMOTE/$RB. could not be fast-forwarded";
        elif [ "$LB" = "$CLB" ]; then
          echo " branch $LB was $NBEHIND commit(s) behind of $REMOTE/$RB. fast-forward merge";
          git merge -q $ARB;
        else
          echo " branch $LB was $NBEHIND commit(s) behind of $REMOTE/$RB. reseting local branch to remote";
          git branch -l -f $LB -t $ARB >/dev/null;
        fi
      fi
    done
  done
}

main $@

It works great so far but I was wondering how to tweak it to pull all branches, for some reason it won't pull certain local branches.

First example: I got 4 local branches behind with master being the current one, after running this script few branches (4) that were behind respect to the remote were pulled but I can still see the master branch behind the remote like the below picture:

Second example: before running the script I got this, 2 local branches behind and the current one (release) is fine:

I run the script and I got this:

So, how could i tweak the script to pull "all" local branches?

Answer 1

First check your upstream branch for master: it might not be origin, which is why pulling from origin might not have any effect for master.

git rev-parse --abbrev-ref --symbolic-full-name master@{u}

Second, to display in a script the number of commits ahead/behind, use the Git 1.9 syntax %(upstream:track) :

git for-each-ref --format="%(refname:short) %(upstream:track)" refs/heads

Note that the upstream branch (or remote tracking branch, that is the branch you are pulling from) might differs from the branch you are pushing to.
Check if you see a push url with:

git config --get-regexp branch.master

Answer 2

In addition to my previous answer, I would add that your script should only limit the merge or reset of a given branch to it upstream branch.
Hence my use of %(upstream:track)

Here is the script I just tested with:

• git version 2.11.0.windows.1
• SourceTree 1.9.10.0

That is:

#!/bin/bash

branches=$(git for-each-ref --format="%(refname) %(upstream) %(upstream:track)" refs/heads)

echo "${branches}"
branch_checkedout=$(cat .git/HEAD|cut -f2 -d" ")
echo branch checked out: "${branch_checkedout}"

while read -r branch_line; do
  ahead=0
  behind=0
  branch_local=$(echo ${branch_line}|cut -f1 -d" ")
  branch_remote=$(echo ${branch_line}|cut -f2 -d" ")
  echo ${branch_line} | grep "ahead" >/dev/null && ahead=1
  echo ${branch_line} | grep "behind" >/dev/null && behind=1
  NAHEAD=$(( $(git rev-list --count ${branch_remote}..${branch_local} 2>/dev/null) +0))
  NBEHIND=$(( $(git rev-list --count ${branch_local}..${branch_remote} 2>/dev/null) +0));

  if [ "$NBEHIND" -gt 0 ]; then
    if [ "$NAHEAD" -gt 0 ]; then
      echo " branch $LB is $NBEHIND commit(s) behind and $NAHEAD commit(s) ahead of $REMOTE/$RB. could not be fast-forwarded";
    elif [ "${branch_local}" = "${branch_checkedout}" ]; then
      echo " branch ${branch_local} was $NBEHIND commit(s) behind of ${branch_remote}. fast-forward merge";
      echo "git merge -q ${branch_remote}"
      git merge -q ${branch_remote};
    else
      echo " branch ${branch_local} was $NBEHIND commit(s) behind of ${branch_remote}. reseting local branch to remote";
      bl=${branch_local#*/}
      bl=${bl#*/}
      echo "git branch -l -f ${bl} -t ${branch_remote}"
      git branch -l -f ${bl} -t ${branch_remote} >/dev/null;
    fi
  fi
done <<< "${branches}"

Note the use of:

• branches=$(git for-each-ref --format="%(refname) %(upstream) %(upstream:track)" refs/heads)
  to get both the full upstream branch name, and the ahead/behind status
• branch_checkedout=$(cat .git/HEAD|cut -f2 -d" ") to get the name of the checked out branch
• while read -r branch_line; do to loop only on the branches with upstreams, and not "all the remotes" (which might or might not include a given branch)