mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-21 07:16:21 +00:00
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>
This commit is contained in:
parent
a54c527ae9
commit
23d7781c0b
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user