Add the ability to set the filename's used for create_patch and merge #2

Activity

1. sunshowers commented on Dec 23, 2020

   

   sunshowers

   on Dec 23, 2020

   Last edited by sunshowers

   More actions

   I was looking at implementing this because I'd like it in guppy, and I'm wondering whether we need to treat filenames slightly differently than we do not. I did some investigation and it looks like git diff escapes filenames that aren't UTF-8. On Linux (tested on zsh):

   git init
   touch foobar$'\224'
   git add .
   git diff --cached
   

   prints

   diff --git "a/foobar\224" "b/foobar\224"
   new file mode 100644
   index 0000000..e69de29

   Think maybe we should do the same thing, unless there's another use case I might be missing.
2. sunshowers commented on Dec 23, 2020

   

   sunshowers

   on Dec 23, 2020

   More actions

   Ah nvm:

   git -c "core.quotePath=false" diff --cached
   

   prints filenames without escaping them. Oh well.
3. rjuju

   added a commit that references this issue on Jul 11, 2021

   Allow custom original and modified file names in DiffOptions.

   ...

   This issue will close once commit aa3d7e3 is merged into the 'master' branch.

   aa3d7e3
4. kpcyrd commented on Apr 15, 2024

   

   kpcyrd

   on Apr 15, 2024

   More actions

   I was wondering the same, Patch::new does pretty much what I need but isn't public.

   For other people running into this issue, there's a crate that can be used in the meantime: https://crates.io/crates/diffy-fork-filenames
5. eyakubovich

   added a commit that references this issue on Sep 27, 2024

   Allow custom original and modified file names in DiffOptions.

   ...

   This issue will close once commit 53bcaae is merged into the 'master' branch.

   53bcaae
6. wolfv

   added a commit that references this issue on Dec 29, 2025

   chore: release v0.4.3 (bmwill#2)

   d5c8a33