https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=42373 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #8 from David Nind <david@davidnind.com> --- I'm getting a sha1/fake ancestor error when trying to apply the patch: git bz apply 42373 📋 Bug 42373 - Add ability to disallow unbounded patron api searches • 197516 - Bug 42373: Enforce RESTMaxPatronsPageSize in patron list endpoint • 197517 - Bug 42373: Update database • 197518 - Bug 42373: Add unit tests • 197525 - Bug 42373: Don't show invalid options in the show entries pulldown Apply? [(y)es, (n)o, (i)nteractive] y Preparing 4 patch(es): ✓ Prepared 4 patch(es) Applying 4 patch(es): ✓ [1/4] Applied Bug 42373: Enforce RESTMaxPatronsPageSize in patron list en… ✓ [2/4] Applied Bug 42373: Update database ✓ [3/4] Applied Bug 42373: Add unit tests Patch application failed for attachment 197525 - Bug 42373: Don't show invalid options in the show entries pulldown Patches left in /tmp/Io01InWa6i for manual application if needed To resolve: 1. Fix conflicts (use 'git mergetool' or edit files manually) 2. Stage resolved files with 'git add' 3. Continue with 'git bz apply --continue' or 'git am --continue' 4. Or skip this patch with 'git bz apply --skip' 5. Or abort with 'git bz apply --abort' Error: Apply failed: Git command (git am -3 /tmp/Io01InWa6i/0004-197525.patch) failed: error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch -- You are receiving this mail because: You are watching all bug changes.