Check via shell-script if git repository's master branch is behind origin












0















I'm currently writing a bash script to remind me to rebase git repos when the local master branch is found to be behind origin/master.



I've been searching online for hours and no solution has worked.



So far I have come up with the following, but $? always returns 1 (I suspect this is because even an empty diff still loads less.



#!/bin/bash

REPO_PATH=$1
cd $REPO_PATH

# flow once inside repo
{
git fetch
git diff master origin/master
} &> /dev/null

if [ "" = $? ]
then
echo "Empty"
# logic to follow
else
{
git pull
} &> /dev/null
echo "Don't forget to rebase!!!"
echo $REPO_PATH
fi

# check for changes to master
# If master is behind origin/master
# then pull master and notify me to rebase

# run this at the start of the day (this script should be run from my start_work
# script and should also be periodically run throughout the day. [maybe every
# time I'm about to run coverage/push?])


Anybody have any ideas?



Sorry if this doesn't belong here, I wasn't sure whether to ask here or on Superuser.










share|improve this question







New contributor




davidkiarie is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.

























    0















    I'm currently writing a bash script to remind me to rebase git repos when the local master branch is found to be behind origin/master.



    I've been searching online for hours and no solution has worked.



    So far I have come up with the following, but $? always returns 1 (I suspect this is because even an empty diff still loads less.



    #!/bin/bash

    REPO_PATH=$1
    cd $REPO_PATH

    # flow once inside repo
    {
    git fetch
    git diff master origin/master
    } &> /dev/null

    if [ "" = $? ]
    then
    echo "Empty"
    # logic to follow
    else
    {
    git pull
    } &> /dev/null
    echo "Don't forget to rebase!!!"
    echo $REPO_PATH
    fi

    # check for changes to master
    # If master is behind origin/master
    # then pull master and notify me to rebase

    # run this at the start of the day (this script should be run from my start_work
    # script and should also be periodically run throughout the day. [maybe every
    # time I'm about to run coverage/push?])


    Anybody have any ideas?



    Sorry if this doesn't belong here, I wasn't sure whether to ask here or on Superuser.










    share|improve this question







    New contributor




    davidkiarie is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
    Check out our Code of Conduct.























      0












      0








      0








      I'm currently writing a bash script to remind me to rebase git repos when the local master branch is found to be behind origin/master.



      I've been searching online for hours and no solution has worked.



      So far I have come up with the following, but $? always returns 1 (I suspect this is because even an empty diff still loads less.



      #!/bin/bash

      REPO_PATH=$1
      cd $REPO_PATH

      # flow once inside repo
      {
      git fetch
      git diff master origin/master
      } &> /dev/null

      if [ "" = $? ]
      then
      echo "Empty"
      # logic to follow
      else
      {
      git pull
      } &> /dev/null
      echo "Don't forget to rebase!!!"
      echo $REPO_PATH
      fi

      # check for changes to master
      # If master is behind origin/master
      # then pull master and notify me to rebase

      # run this at the start of the day (this script should be run from my start_work
      # script and should also be periodically run throughout the day. [maybe every
      # time I'm about to run coverage/push?])


      Anybody have any ideas?



      Sorry if this doesn't belong here, I wasn't sure whether to ask here or on Superuser.










      share|improve this question







      New contributor




      davidkiarie is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
      Check out our Code of Conduct.












      I'm currently writing a bash script to remind me to rebase git repos when the local master branch is found to be behind origin/master.



      I've been searching online for hours and no solution has worked.



      So far I have come up with the following, but $? always returns 1 (I suspect this is because even an empty diff still loads less.



      #!/bin/bash

      REPO_PATH=$1
      cd $REPO_PATH

      # flow once inside repo
      {
      git fetch
      git diff master origin/master
      } &> /dev/null

      if [ "" = $? ]
      then
      echo "Empty"
      # logic to follow
      else
      {
      git pull
      } &> /dev/null
      echo "Don't forget to rebase!!!"
      echo $REPO_PATH
      fi

      # check for changes to master
      # If master is behind origin/master
      # then pull master and notify me to rebase

      # run this at the start of the day (this script should be run from my start_work
      # script and should also be periodically run throughout the day. [maybe every
      # time I'm about to run coverage/push?])


      Anybody have any ideas?



      Sorry if this doesn't belong here, I wasn't sure whether to ask here or on Superuser.







      bash shell-script shell git






      share|improve this question







      New contributor




      davidkiarie is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
      Check out our Code of Conduct.











      share|improve this question







      New contributor




      davidkiarie is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
      Check out our Code of Conduct.









      share|improve this question




      share|improve this question






      New contributor




      davidkiarie is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
      Check out our Code of Conduct.









      asked 22 mins ago









      davidkiariedavidkiarie

      11




      11




      New contributor




      davidkiarie is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
      Check out our Code of Conduct.





      New contributor





      davidkiarie is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
      Check out our Code of Conduct.






      davidkiarie is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
      Check out our Code of Conduct.






















          1 Answer
          1






          active

          oldest

          votes


















          0














          Instead of looking at the exit status, you could look at the actual output



          eg



          git fetch &> /dev/null
          diffs=$(git diff master origin/master)

          if [ -z "$diffs" ]
          then
          echo "Empty"





          share|improve this answer

























            Your Answer








            StackExchange.ready(function() {
            var channelOptions = {
            tags: "".split(" "),
            id: "106"
            };
            initTagRenderer("".split(" "), "".split(" "), channelOptions);

            StackExchange.using("externalEditor", function() {
            // Have to fire editor after snippets, if snippets enabled
            if (StackExchange.settings.snippets.snippetsEnabled) {
            StackExchange.using("snippets", function() {
            createEditor();
            });
            }
            else {
            createEditor();
            }
            });

            function createEditor() {
            StackExchange.prepareEditor({
            heartbeatType: 'answer',
            autoActivateHeartbeat: false,
            convertImagesToLinks: false,
            noModals: true,
            showLowRepImageUploadWarning: true,
            reputationToPostImages: null,
            bindNavPrevention: true,
            postfix: "",
            imageUploader: {
            brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
            contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
            allowUrls: true
            },
            onDemand: true,
            discardSelector: ".discard-answer"
            ,immediatelyShowMarkdownHelp:true
            });


            }
            });






            davidkiarie is a new contributor. Be nice, and check out our Code of Conduct.










            draft saved

            draft discarded


















            StackExchange.ready(
            function () {
            StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2funix.stackexchange.com%2fquestions%2f503473%2fcheck-via-shell-script-if-git-repositorys-master-branch-is-behind-origin%23new-answer', 'question_page');
            }
            );

            Post as a guest















            Required, but never shown

























            1 Answer
            1






            active

            oldest

            votes








            1 Answer
            1






            active

            oldest

            votes









            active

            oldest

            votes






            active

            oldest

            votes









            0














            Instead of looking at the exit status, you could look at the actual output



            eg



            git fetch &> /dev/null
            diffs=$(git diff master origin/master)

            if [ -z "$diffs" ]
            then
            echo "Empty"





            share|improve this answer






























              0














              Instead of looking at the exit status, you could look at the actual output



              eg



              git fetch &> /dev/null
              diffs=$(git diff master origin/master)

              if [ -z "$diffs" ]
              then
              echo "Empty"





              share|improve this answer




























                0












                0








                0







                Instead of looking at the exit status, you could look at the actual output



                eg



                git fetch &> /dev/null
                diffs=$(git diff master origin/master)

                if [ -z "$diffs" ]
                then
                echo "Empty"





                share|improve this answer















                Instead of looking at the exit status, you could look at the actual output



                eg



                git fetch &> /dev/null
                diffs=$(git diff master origin/master)

                if [ -z "$diffs" ]
                then
                echo "Empty"






                share|improve this answer














                share|improve this answer



                share|improve this answer








                edited 5 mins ago

























                answered 12 mins ago









                Stephen HarrisStephen Harris

                26.4k24779




                26.4k24779






















                    davidkiarie is a new contributor. Be nice, and check out our Code of Conduct.










                    draft saved

                    draft discarded


















                    davidkiarie is a new contributor. Be nice, and check out our Code of Conduct.













                    davidkiarie is a new contributor. Be nice, and check out our Code of Conduct.












                    davidkiarie is a new contributor. Be nice, and check out our Code of Conduct.
















                    Thanks for contributing an answer to Unix & Linux Stack Exchange!


                    • Please be sure to answer the question. Provide details and share your research!

                    But avoid



                    • Asking for help, clarification, or responding to other answers.

                    • Making statements based on opinion; back them up with references or personal experience.


                    To learn more, see our tips on writing great answers.




                    draft saved


                    draft discarded














                    StackExchange.ready(
                    function () {
                    StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2funix.stackexchange.com%2fquestions%2f503473%2fcheck-via-shell-script-if-git-repositorys-master-branch-is-behind-origin%23new-answer', 'question_page');
                    }
                    );

                    Post as a guest















                    Required, but never shown





















































                    Required, but never shown














                    Required, but never shown












                    Required, but never shown







                    Required, but never shown

































                    Required, but never shown














                    Required, but never shown












                    Required, but never shown







                    Required, but never shown







                    Popular posts from this blog

                    Loup dans la culture

                    How to solve the problem of ntp “Unable to contact time server” from KDE?

                    ASUS Zenbook UX433/UX333 — Configure Touchpad-embedded numpad on Linux