[patch] refresh index before git reset

0001-GitSync.update-refresh-index-before-git-reset-bug-55.patch (text/plain), 1.18 KB, created by Zac Medico on 2016-07-17 05:11:55 UTC

From 87d6489167fbaddcb6a7552438f41fdf5a61759b Mon Sep 17 00:00:00 2001
From: Zac Medico <[e-mail]>
Date: Sat, 16 Jul 2016 21:55:18 -0700
Subject: [PATCH] GitSync.update: refresh index before git reset (bug 552814)

Refresh the index in order to ensure that `git reset --hard`
will not re-write files unnecessarily.

X-Gentoo-Bug: 552814
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=552814
---
 pym/portage/sync/modules/git/git.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pym/portage/sync/modules/git/git.py b/pym/portage/sync/modules/git/git.py
index 09257f3..6cf44aa 100644
--- a/pym/portage/sync/modules/git/git.py
+++ b/pym/portage/sync/modules/git/git.py
@@ -110,6 +110,12 @@ class GitSync(NewBase):
 			**self.spawn_kwargs)
 
 		if exitcode == os.EX_OK and self.repo.sync_depth is not None:
+			# Refresh the index in order to ensure that `git reset --hard`
+			# will not re-write files unnecessarily.
+			subprocess.call(
+				[self.bin_command, 'update-index', '--really-refresh'],
+				cwd=portage._unicode_encode(self.repo.location))
+
 			reset_cmd = [self.bin_command, 'reset', '--hard', remote_branch]
 			if quiet:
 				reset_cmd.append('--quiet')
-- 
2.7.4