On 10 May 2018 at 15:16, Oliver Joseph Ash <oliverjash@xxxxxxxxx> wrote: > (Apologies, I accidentally sent this as a reply to the original post, instead of your email. I'm new to this!) (No worries.) ;-) >> does your test involve unusual file systems, funny characters in filenames, ..? You are on some sort of Linux, right? > > I'm running macOS 10.13.4. I don't have any unusual file system setup, as far as I'm aware. The filename in my test case is simply `foo`. I'm not too familiar with Mac, unfortunately, but let's see.. > I tried the steps you suggested: on git 2.17.0, saving the patch, editing it, and applying it, and it succeeded. > >> should now show bar2 in the first hunk and bar1 in the second hunk, just like your edited test.patch. > > That was the case, although I had to remove the `--check` flag from `git apply`. Hmm, you mean that `git apply --check test.patch` failed? With error messages? Or, you had to remove the --check flag in order for the patch to actually be applied on disk? I would guess it's the latter, but just to be clear. >> How comfortable are you with building Git from the sources? > > I've never done it before, but I assume it's well documented, so I'm willing to give it a shot! > > Happy to try any steps to debug this! Although I'm a bit surprised no-one else can reproduce it with the same version of Git, which makes it seem less likely this could be a bug, and more likely it's something in my setup. Where do the git 2.17.0 and 2.16.2 come from that you have been testing? Homebrew? Apple? (Ple So you should be able to do `git clone https://github.com/git/git.git` and read INSTALL. It might be useful to start with `git checkout v2.17.0` to make sure you're testing roughly the same thing as before. As for obtaining the dependencies, since I'm not familiar with Mac, I cannot give any good hints. I see now that Phillip has replied with a good guess. Let's hope he has managed to circle in on what's causing your problem. Martin
