[SOLVED] What bash command can be used to tell if a local git repository is out of sync with its remote

Issue

Searching in StackOverflow and on Google, I can find lots of items about how to sync, and do everything with git, except I can't find a reliable way using a bash script to tell if my local repository is in sync with its remote. I've tried:

1.

git branch -v |
perl -wlne'
   print "$ENV{reponame} [$1] --> $3 $2"
      if /^..(\S+)\s+([a-f0-9]+)\s+(\[(?:ahead|behind)\s+\d+\])/
' |
while IFS= read -r MOD; do
   printf ' %s\n' "$MOD"  # Replace with code that uses $MOD
done

and,

2.

isInSync=`git remote update>/dev/null; git status -uno | grep -o "is up to date"`
if [ $? -ne 0  ]; then
    echo " $reponame [$br] --> Out of sync with remote at $d"
    ok=false
fi

and have been trying to find a way to use:

3. git log --oneline | head -n1 | sed # this I don't know.

to try to get the first word in the log file, which is the commit hash of the last commit, and compare it with:

rev=$(git rev-parse --short HEAD)

which is the commit hash of the local repository branch you are in.

The problem with #1 is that it doesn't seem to pick up when the local is out of sync with the remote.

The problem with # 2, is that it causes the local .git/config to get involved and produces odd attempts to access different remote repositories like heroic.

The problem with #3 is that I can't figure out how to get the hash code from the git log and then compare it to the $rev above. It would seem to be the best bet as when I check it on different computers in different states, it seems to convey the right information.

I am writing a bash script that checks a group of git projects and tells me their states, i.e. up to date, untracked files, uncommitted files, and out of sync with the remote.

Help would be appreciated in either suggesting a better way or how to do the extraction of the commit-hash from the log and compare it to the current commit-hash of the local last commit.

Solution

In the above code for git_check, I replace the section: 2.

isInSync=`git remote update>/dev/null; git status -uno | grep -o "is up to date"`
if [ $? -ne 0  ]; then
    echo " $reponame [$br] --> Out of sync with remote at $d"
    ok=false
fi

with:

last_commit=`git log --oneline | head -n1 | grep -o "^\w*\b"`
rev=$(git rev-parse --short HEAD)
if [ "$last_commit" != "$rev"  ]; then
    echo " $reponame [$br] --> Out of sync with remote at $d"
    ok=false
fi

Here is the Console output with some comments

Modify a file that has been committed.

[:~/bin] develop(+4/-2) 2s ± git status
On branch develop
Your branch is up to date with 'origin/develop'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
    modified:   git_check

no changes added to commit (use "git add" and/or "git commit -a")

[:~/bin] develop(+4/-2) ± git_check
 bin [develop] --> Changes to be staged/committed at /Users/userid/bin

[:~/bin] develop(+4/-2) 128 ± git add -A
[:~/bin] develop(+0/-0) ± git diff --cached --shortstat
 1 file changed, 4 insertions(+), 2 deletions(-)

[:~/bin] develop(+0/-0) ± git_check
 bin [develop] --> Changes to be committed at /Users/userid/bin

[:~/bin] develop(+0/-0) 2s ± git commit -m "Better way to check for remote sync"[develop fab4f1d] Better way to check for remote sync
 1 file changed, 4 insertions(+), 2 deletions(-)
[:~/bin] develop(1) ± git_check
 OK --> bin [develop] fab4f1d
 bin [develop] --> [ahead 1] fab4f1d

[:~/bin] develop(1) 2s ± git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 4 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 416 bytes | 416.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
To https://github.com/userid/repo.git
   ee0f0ca..fab4f1d  develop -> develop
[:~/bin] develop 4s ± git_check
 OK --> bin [develop] fab4f1d

For me, at least, this appears to solve my problem. As the console output shows, it gives me information about what is happening at each stage of the workflow. Especially, it tells me that my local repository is ahead of the remote repository by 1, telling me I need to do a push. On the other machines, I will see that they are behind by 1, telling me I need to do a pull to sync up.

Thanks to torek for the helpful information.

Answered By - John Wooten

Answer Checked By - Marie Seifert (WPSolving Admin)