commit: f77fcd6b0b4ebb49ca62f5767cd5c931127c3dbb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 19:14:11 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 21:23:30 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f77fcd6b
[sync] Run `git update-index --refresh` when doing shallow pulls
Run `git update-index --refresh` to force proper index recheck before
running `git reset --merge` on a shallow pull. This fixes syncing on
some filesystem configurations including overlayfs on squashfs.
Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>
pym/portage/sync/modules/git/git.py | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/pym/portage/sync/modules/git/git.py
b/pym/portage/sync/modules/git/git.py
index 3734b80..dc94ec9 100644
--- a/pym/portage/sync/modules/git/git.py
+++ b/pym/portage/sync/modules/git/git.py
@@ -89,7 +89,7 @@ class GitSync(NewBase):
else:
# Since the default merge strategy typically fails when
# the depth is not unlimited, use `git fetch` followed
by
- # `git reset --merge`.
+ # `git update-index --refresh`, then `git reset
--merge`.
try:
remote_branch = portage._unicode_decode(
subprocess.check_output([self.bin_command, 'rev-parse',
@@ -116,12 +116,23 @@ class GitSync(NewBase):
**self.spawn_kwargs)
if exitcode == os.EX_OK and self.repo.sync_depth is not None:
- reset_cmd = [self.bin_command, 'reset', '--merge',
remote_branch]
- if quiet:
- reset_cmd.append('--quiet')
- exitcode = subprocess.call(reset_cmd,
+ # update-index --refresh is needed on some filesystems
+ # (e.g. with overlayfs on squashfs)
+ update_index_cmd = [self.bin_command, 'update-index']
+ if quiet: # -q needs to go first
+ update_index_cmd.append('-q')
+ update_index_cmd.append('--refresh')
+
+ exitcode = subprocess.call(update_index_cmd,
cwd=portage._unicode_encode(self.repo.location))
+ if exitcode == os.EX_OK:
+ reset_cmd = [self.bin_command, 'reset',
'--merge', remote_branch]
+ if quiet:
+ reset_cmd.append('--quiet')
+ exitcode = subprocess.call(reset_cmd,
+
cwd=portage._unicode_encode(self.repo.location))
+
if exitcode != os.EX_OK:
msg = "!!! git pull error in %s" % self.repo.location
self.logger(self.xterm_titles, msg)
