Don't print "Already up-to-date" during repo syncv1.0.8

If we are already up-to-date we just want to display no output.
This means we have to avoid calling "git merge" if there aren't
commits to be merged into the working directory.

Signed-off-by: Shawn O. Pearce <sop@google.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/project.py b/project.py
index b8a347d9..ffbdfd1c 100644
--- a/project.py
+++ b/project.py
@@ -563,7 +563,7 @@ class Project(object):
           _info("[%s] Consider merging or rebasing the"
                 " unpublished commits.", self.name)
         return True
-      else:
+      elif upstream_gain:
         # We can fast-forward safely.
         #
         try:
@@ -572,6 +572,10 @@ class Project(object):
           return False
         self._CopyFiles()
         return True
+      else:
+        # Trivially no changes in the upstream.
+        #
+        return True
 
     if merge == rev:
       try: