Skip to content
Snippets Groups Projects
Commit a39af3d4 authored by Peter Kjellerstedt's avatar Peter Kjellerstedt Committed by Mike Frysinger
Browse files

project: Add a missing call to _CopyAndLinkFiles


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: default avatarPeter Kjellerstedt <peter.kjellerstedt@axis.com>
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/344475


Reviewed-by: default avatarMike Frysinger <vapier@google.com>
parent 4cdfdb77
Branches
No related tags found
No related merge requests found
...@@ -1462,6 +1462,8 @@ class Project(object): ...@@ -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):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment