Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-18 Thread Bert Wesarg
On Tue, Sep 18, 2012 at 4:52 AM, Mischa POSLAWSKY wrote: > Junio C Hamano skribis 2012-9-16 22:22 (-0700): > >> Mischa POSLAWSKY writes: >> >> > Subject: [PATCH/RFC] format-patch: force default file prefixes in diff >> > >> > Override user configuration (eg. diff.noprefix) in patches intended for

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-17 Thread Junio C Hamano
Mischa POSLAWSKY writes: >> Perhaps you had configured your diff.noprefix in a wrong >> configuration file? This is primarily per-project choice, and your >> clone of git.git should not have diff.noprefix set, neither your >> $HOME/.gitconfig unless you always work on projects that want >> diff.

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-17 Thread Mischa POSLAWSKY
Junio C Hamano skribis 2012-9-16 22:22 (-0700): > Mischa POSLAWSKY writes: > > > Subject: [PATCH/RFC] format-patch: force default file prefixes in diff > > > > Override user configuration (eg. diff.noprefix) in patches intended for > > external consumption to match the default prefixes expected

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-17 Thread Junio C Hamano
Jeff King writes: > On Sun, Sep 16, 2012 at 10:24:04PM -0700, Junio C Hamano wrote: > >> Mischa POSLAWSKY writes: >> >> > Matching the default file prefix b/ does not yield any results if config >> > option diff.noprefix or diff.mnemonicprefix is enabled. >> > >> > Signed-off-by: Mischa POSLAWS

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-17 Thread Jeff King
On Sun, Sep 16, 2012 at 10:24:04PM -0700, Junio C Hamano wrote: > Mischa POSLAWSKY writes: > > > Matching the default file prefix b/ does not yield any results if config > > option diff.noprefix or diff.mnemonicprefix is enabled. > > > > Signed-off-by: Mischa POSLAWSKY > > --- > > Very useful s

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-16 Thread perryh
Mischa POSLAWSKY wrote: > ... I would argue against diff options creating non-standard patches. Seems to me it might depend on what one means by "non-standard". I can envision cases in which increasing the number of context lines would result in the patch being more robust WRT applying correctl

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-16 Thread Junio C Hamano
Mischa POSLAWSKY writes: > Matching the default file prefix b/ does not yield any results if config > option diff.noprefix or diff.mnemonicprefix is enabled. > > Signed-off-by: Mischa POSLAWSKY > --- > Very useful script otherwise; thanks. > > contrib/git-jump/git-jump | 4 ++-- > 1 file change

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-16 Thread Junio C Hamano
Mischa POSLAWSKY writes: >> diff --git contrib/git-jump/git-jump contrib/git-jump/git-jump >> index a33674e..dc90cd6 100755 >> --- contrib/git-jump/git-jump >> +++ contrib/git-jump/git-jump > > Apparently diff.noprefix also applies to git format-patch. Even though > git am does explicitly suppor

Re: [PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-16 Thread Mischa POSLAWSKY
> diff --git contrib/git-jump/git-jump contrib/git-jump/git-jump > index a33674e..dc90cd6 100755 > --- contrib/git-jump/git-jump > +++ contrib/git-jump/git-jump Apparently diff.noprefix also applies to git format-patch. Even though git am does explicitly support -p0, I would argue against diff op

[PATCH] git-jump: ignore (custom) prefix in diff mode

2012-09-16 Thread Mischa POSLAWSKY
Matching the default file prefix b/ does not yield any results if config option diff.noprefix or diff.mnemonicprefix is enabled. Signed-off-by: Mischa POSLAWSKY --- Very useful script otherwise; thanks. contrib/git-jump/git-jump | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --