From 23d7781c0bac53b24f4598104e8ba38310e8d100 Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <sop@google.com>
Date: Thu, 30 Oct 2008 11:06:57 -0700
Subject: [PATCH] Don't print "Already up-to-date" during repo sync

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>
---
 project.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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: