android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't print "Already up-to-date" during repo sync

Browse Source 
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>
This commit is contained in:
Shawn O. Pearce 2008-10-30 11:06:57 -07:00
parent a54c527ae9
commit 23d7781c0b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project.py
View File

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