Skip to content

Commit b577444

Browse files
computersforpeaceLUCI
authored andcommitted
project: Copy and link files even with local branches
In the winding maze that constitutes Sync_LocalHalf(), there are paths in which we don't copy-and-link files. Examples include something like: cd some/project/ repo start head . # do some work, make some commit, upload that commit to Gerrit [[ ... in the meantime, someone addes a <linkfile ...> for some/project/ in the manifest ... ]] cd some/project/ git pull --rebase repo sync In this case, we never hit a `repo rebase` case, which might have saved us. Instead, the developer is left confused why some/project/ never had its <linkfile>s created. Notably, this opens up one more corner case in which <linkfile ... /> or <copyfile ... /> could potentially clobber existing work in the destination directory, but there are existing cases where that's true, and frankly, those seem like bigger holes than this new one. Change-Id: I394b0e4529023a8ee319dc25d03d513a19251a4a Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/437421 Reviewed-by: Josip Sokcevic <[email protected]> Tested-by: Brian Norris <[email protected]> Commit-Queue: Brian Norris <[email protected]>
1 parent 1e19f7d commit b577444

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

project.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1694,6 +1694,8 @@ def _dosubmodules():
16941694
project=self.name,
16951695
)
16961696
)
1697+
return
1698+
syncbuf.later1(self, _doff, not verbose)
16971699
return
16981700
elif pub == head:
16991701
# All published commits are merged, and thus we are a

0 commit comments

Comments
 (0)