commit: 242a84765384452152b13921659f69f60612b9d6 Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> AuthorDate: Wed Jun 3 08:15:04 2020 +0000 Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> CommitDate: Wed Jun 3 13:50:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=242a8476
cygwin/profile.bashrc: preserve pending dir for cygwin rebase During cygwin rebase, moving all files from pending/ dir to merged/ dir also does move the keepdir file, causing the pending/ dir to get empty. Closes: https://bugs.gentoo.org/726800 Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> profiles/prefix/windows/cygwin/profile.bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc index 85a7eabccb1..4b147868276 100644 --- a/profiles/prefix/windows/cygwin/profile.bashrc +++ b/profiles/prefix/windows/cygwin/profile.bashrc @@ -191,7 +191,7 @@ cygwin-rebase-merge() { [[ ${mode} == 'pending' ]] || exit 0 - find "./${pendingdir}" -maxdepth 1 -type f \ + find "./${pendingdir}" -mindepth 1 -maxdepth 1 -type f -name 'dlls_*' \ -exec mv -f -t "./${mergeddir}/" {} + ) [[ $? == 0 ]] || die "Merging ${mode} files into rebase database failed."
