Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RFC: DO NOT MERGE: patching: rewrite: try to stabilize patch index stanzas as well as From lines #6455

Commits on Apr 27, 2024

  1. RFC: DO NOT MERGE: patching: rewrite: try to stabilize patch index

    …stanzas as well as From lines
    
    - `git format-patch --zero-commit` doesn't affect `index xxx...yyy` lines, only `From: `
      - so use the _classy_ "use a regex with a callback" solution as git format-patch doesn't offer one
    - this will make _all_ patches change when rewritten, but hopefully _for the last time_ !
    - not sure what other impacts this might have though - `git am` might not work any more?
    - we need to preserve `index 000000000000..xxx` as zeros, which indicate new file creation, thus:
      - new file creations are rewritten as `index 000000000000..111111111111`
      - non-creations are rewritten as `index 111111111111..222222222222`
    rpardini committed Apr 27, 2024
    Configuration menu
    Copy the full SHA
    9832007 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3aa4733 View commit details
    Browse the repository at this point in the history