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

project: Add a missing call to _CopyAndLinkFiles

Browse Source 
If a file that is copied using a <copyfile> tag is modified and not
committed or if it is committed to a detached head, then running `repo
sync` would update the target file as expected. However, if the
modified file is committed to a local branch, then running `repo sync'
would not update the target file as expected.

Change-Id: Ic98e37d1c2e51fd1bf15abf149c7d06190cfd6d2
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/344475
Reviewed-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Peter Kjellerstedt 2022-09-01 19:24:36 +02:00 committed by Mike Frysinger
parent 4cdfdb7734
commit a39af3d432
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project.py
View File

@ -1462,6 +1462,8 @@ class Project(object):
cnt_mine += 1 cnt_mine += 1
if not upstream_gain and cnt_mine == len(local_changes): if not upstream_gain and cnt_mine == len(local_changes):
# The copy/linkfile config may have changed.
self._CopyAndLinkFiles()
return return
if self.IsDirty(consider_untracked=False): if self.IsDirty(consider_untracked=False):