Re: [BUG?] Patches created with 'diff.noprefix=true' don't 'git apply'.
- From
Nathan Collins <nathan.collins@gmail.com>
- Date
- May 8, 2014, 04:38 UTC
- Message-ID
- <CAO8RVvcyi6KvrZqueBA+PKCTocL=s7NJGann4CzU0WAf6DxWcA@mail.gmail.com>
- In-Reply-To
- <CAO8RVvfzP_nc9=nwr6JSK9s6u7DEctMpdn_5yca9h7G4TOd2Bw@mail.gmail.com>
On Wed, May 7, 2014 at 4:39 PM, Nathan Collins <nathan.collins@gmail.com> wrote:
Show 36 quoted lines
> On Wed, May 7, 2014 at 11:42 AM, Junio C Hamano <gitster@pobox.com> wrote: >> Nathan Collins <nathan.collins@gmail.com> writes: > >>> For (2), the solution may be to add a separate >>> 'diff.add-clickable-paths' option (probably there is a better name? >>> 'diff.add-copyable-paths'? ...),... >>> ... >>> Concretely, if 'diff.add-clickable-paths' is set, then instead of e.g. >>> >>> diff --git a/src/Data/Function/Decorator/Memoizer/Unsafe.hs >>> b/src/Data/Function/Decorator/Memoizer >>> index 3ef17da..a0586d3 100644 >>> --- a/src/Data/Function/Decorator/Memoizer/Unsafe.hs >>> +++ b/src/Data/Function/Decorator/Memoizer/Unsafe.hs >> >> If you do something along that line, perhaps >> >> Index: src/Data/Function/Decorator/Memoizer/Unsafe.hs >> diff --git a/src/Data/Function/Decorator/Memoizer/Unsafe.hs ... >> index 3ef17da..a0586d3 100644 >> --- a/src/Data/Function/Decorator/Memoizer/Unsafe.hs >> +++ b/src/Data/Function/Decorator/Memoizer/Unsafe.hs >> >> to imitate what "cvs diff" does may be more familar to people. >> >> What would you propose to make clickable in a renaming diff, though? > > Your 'Index' header looks good, and I would expect a renaming diff to > have something like > > Index: foo -> bar > > as in 'git status', but I just realized that a "clickable paths" > option already exists in some sense! There is a '--patch-with-raw' > option (which is "short" for '--patch' and '--raw', hahaha) which > inserts clickable file names in the patch, above each diff.
Or not: I stupidly only tested this with a single file modified: it turns out that all the clickable file names appear at the top of the patch, not as one file name above each corresponding diff as I claimed.
D'oh,
-nathan