Skip to content

Commit

Permalink
project: Add a missing call to _CopyAndLinkFiles
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/344475
Reviewed-by: Mike Frysinger <[email protected]>
  • Loading branch information
Peter Kjellerstedt authored and vapier committed Sep 20, 2022
1 parent 4cdfdb7 commit a39af3d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions project.py
Original file line number Diff line number Diff line change
Expand Up @@ -1462,6 +1462,8 @@ def _dosubmodules():
cnt_mine += 1

if not upstream_gain and cnt_mine == len(local_changes):
# The copy/linkfile config may have changed.
self._CopyAndLinkFiles()
return

if self.IsDirty(consider_untracked=False):
Expand Down

0 comments on commit a39af3d

Please sign in to comment.