On Sun, Sep 16, 2012 at 10:24:04PM -0700, Junio C Hamano wrote:
> Mischa POSLAWSKY <g...@shiar.nl> 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 <g...@shiar.nl>
> > ---
> > Very useful script otherwise; thanks.
> >
> > contrib/git-jump/git-jump | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > 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
> > @@ -21,9 +21,9 @@ open_editor() {
> > }
> >
> > mode_diff() {
> > - git diff --relative "$@" |
> > + git diff --no-prefix --relative "$@" |
> > perl -ne '
> > - if (m{^\+\+\+ b/(.*)}) { $file = $1; next }
> > + if (m{^\+\+\+ (.*)}) { $file = $1; next }
> > defined($file) or next;
> > if (m/^@@ .*\+(\d+)/) { $line = $1; next }
> > defined($line) or next;
>
> Makes sense to me. Peff?
Yes, looks obviously correct. Thanks.
Acked-by: Jeff King <p...@peff.net>
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
