YETUS-983. test-patch confused by multiple commits that include rename#384
YETUS-983. test-patch confused by multiple commits that include rename#384ndimiduk wants to merge 3 commits intoapache:mainfrom
Conversation
Flip dryrun_both_files to prefer cumulative .diff over per-commit .patch. The cumulative diff represents the PR's net change, avoiding stale files left on disk when format-patch stanzas add then rename/delete the same file. Generate the local diff with git diff --binary to preserve binary file handling that GitHub's API .diff endpoint strips. Fall back to the API .diff when local generation fails.
|
Okay I think I tracked this down. Looks like The cumulative In the patch I swap the logic of |
e72965a to
9482fc6
Compare
Flip dryrun_both_files to prefer cumulative .diff over per-commit .patch. The cumulative diff represents the PR's net change, avoiding stale files left on disk when format-patch stanzas add then rename/delete the same file.
Generate the local diff with git diff --binary to preserve binary file handling that GitHub's API .diff endpoint strips. Fall back to the API .diff when local generation fails.