Bug: `git commit --fixup` with duplicate commit messages

2018-12-14 Thread Oliver Joseph Ash
Hi, I believe I have found a bug in `git commit --fixup`. Steps to reproduce: 1. Create a git history with two commits (A and B) with the same commit message (e.g. foo) 2. Create a new commit using `git commit --fixup {SHA}`, referring to the last commit SHA 3. Run an interactive rebase Expected

Re: Regression in patch add?

2018-05-10 Thread Oliver Joseph Ash
You found the problem Phillip! My editor was trimming trailing white space, which breaks the context line. I had tried to use an alternative editor to account for any editor specific behaviour, but it turns out both the editors I tested in were doing this! I suspect this change in behaviour wil

Re: Regression in patch add?

2018-05-10 Thread Oliver Joseph Ash
(Apologies, I accidentally sent this as a reply to the original post, instead of your email. I'm new to this!) > 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 syste

Re: Regression in patch add?

2018-05-10 Thread Oliver Joseph Ash
> 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 tried the steps you suggested: on

Re: Regression in patch add?

2018-05-10 Thread Oliver Joseph Ash
I just ran into a similar problem: https://stackoverflow.com/questions/50258565/git-editing-hunks-fails-when-file-has-other-hunks I can reproduce on 2.17.0. The issue doesn't occur on 2.16.2, however. Is this a bug?