Since `git reset --merge` gives the closest behavior to `git pull`, use it instead of `-git reset --hard`. This will provide the following advantages: * git will not have to stat files that have not changed since the previous sync, which will allow for optimal performance * git will abort if there are unstaged local changes to any files that have changed since the previous sync Suggested-by: Michał Górny <email@example.com> Fixes 84413bb1dd9d ("GitSync.update: respect sync-depth (bug 552814)")
Fix updates to respect sync-depth (previously it was only respected for clone operations). Since the default merge strategy typically fails when the the depth is not unlimited, use `git fetch` followed by `git reset --hard`. X-Gentoo-Bug: 552814 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=552814 Acked-by: Brian Dolbec <firstname.lastname@example.org>
Change cache modules to write md5 in cache entries, instead of mtime. Since portage-2.2.27, the relevant cache modules have had the ability to read cache entries containing either md5 or mtime, therefore this change is backward-compatible with portage-2.2.27 and later. Also fix the reconstruct_eclasses function to raise CacheCorruption when the specified chf_type is md5 and the cache entry contains mtime data, and optimize __getitem__ to skip reconstruct_eclasses calls when the entry appears to have a different chf_type. X-Gentoo-Bug: 568934 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=568934 Acked-by: Alexander Berntsen <email@example.com>
This option will cause emerge to automatically apply autounmask changes to configuration files, and continue to execute the specified command. If the dependency calculation is not entirely successful, then emerge will simply abort without modifying any configuration files. This sort of behavior can be very useful in a continuous integration setting, where the emerge invocation might be inside of a container that is later discarded (so there is no threat of negative consequences). It's also safe for general use, when combined with the --ask option. X-Gentoo-Bug: 582624 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=582624 Acked-by: Brian Dolbec <firstname.lastname@example.org>
Make LIVEVCS.* checks fatal to prevent people from committing ebuilds using live eclasses instead of package.masking them afterwards by QA. Acked-by: Zac Medico <email@example.com>
Use https where available, and update old links (like www.gentoo.org) to point to the new location.