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

Silence 'Current branch %s is up to date' during sync

Browse Source 
We accidentally introduced this message during 1.6.8 by always
invoking `git rebase` when there were no new commits from the
upstream, but the user had local commits.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2009-06-03 11:09:12 -07:00
parent 8135cdc53c
commit da88ff4411
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project.py
View File

@ -733,9 +733,7 @@ class Project(object):
last_mine = commit_id last_mine = commit_id
cnt_mine += 1 cnt_mine += 1
if not local_changes and not upstream_gain: if not upstream_gain and cnt_mine == len(local_changes):
# Trivially no changes caused by the upstream.
#
return return
if self.IsDirty(consider_untracked=False): if self.IsDirty(consider_untracked=False):