summaryrefslogtreecommitdiffstats
path: root/project.py
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2022-09-01 19:24:36 +0200
committerMike Frysinger <vapier@google.com>2022-09-20 09:24:01 +0000
commita39af3d4322135202aabfc78cc65809a28a4ca75 (patch)
treee2f4a0f51ce18f3aaf4fb6de0e68542e336a632f /project.py
parent4cdfdb77343b2d4664c0a13c9e485a02988e578f (diff)
downloadgit-repo-a39af3d4322135202aabfc78cc65809a28a4ca75.tar.gz
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: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/344475 Reviewed-by: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'project.py')
-rw-r--r--project.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/project.py b/project.py
index 0da2118b..1c85b044 100644
--- a/project.py
+++ b/project.py
@@ -1462,6 +1462,8 @@ class Project(object):
1462 cnt_mine += 1 1462 cnt_mine += 1
1463 1463
1464 if not upstream_gain and cnt_mine == len(local_changes): 1464 if not upstream_gain and cnt_mine == len(local_changes):
1465 # The copy/linkfile config may have changed.
1466 self._CopyAndLinkFiles()
1465 return 1467 return
1466 1468
1467 if self.IsDirty(consider_untracked=False): 1469 if self.IsDirty(consider_untracked=False):