All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce-o8xcbExO1WpAfugRpC6u6w@public.gmane.org>
To: Alexander Gladysh <agladysh-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: git-users-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
	git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: Git Gui does not want to work on chunk level
Date: Mon, 15 Sep 2008 07:24:21 -0700	[thread overview]
Message-ID: <20080915142421.GE6320@spearce.org> (raw)
In-Reply-To: <c6c947f60809150721m1ec11f10xc68ce39559398659-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>


Alexander Gladysh <agladysh-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> On Fri, Sep 5, 2008 at 8:53 AM, Shawn O. Pearce <spearce-o8xcbExO1WpAfugRpC6u6w@public.gmane.org> wrote:
> 
> > git-gui: Fix diff parsing for lines starting with "--" or "++"
> 
> Somewhat related bug, but reproduceable event without "--". If I set
> diff context to none in git gui (by repeatedly clicking "show less
> context") I'm sometimes not able to stage hunk or line.

git-apply refuses to apply a patch with 0 context lines.  Latest
git-gui in maint (and in Git 1.6.0.2?) won't let you reduce the
number of context lines below 1, so you never can see this error.
 
> Reduce context to none, then do stage hunk. It fails with message:
> 
> error: patch failed: file.ext:3
> error: file.ext: patch does not apply
> OK

-- 
Shawn.

      parent reply	other threads:[~2008-09-15 14:25 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <c6c947f60808270216k2feb8f9ar765cdee1fc3910ee@mail.gmail.com>
     [not found] ` <c6c947f60808270216k2feb8f9ar765cdee1fc3910ee-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2008-09-03 19:23   ` Git Gui does not want to work on chunk level Alexander Gladysh
2008-09-03 23:08     ` Shawn O. Pearce
2008-09-04  9:20       ` Alexander Gladysh
2008-09-04 14:37         ` Shawn O. Pearce
     [not found]           ` <20080904143723.GB23708-o8xcbExO1WpAfugRpC6u6w@public.gmane.org>
2008-09-04 14:54             ` Alexander Gladysh
2008-09-05  4:53               ` Shawn O. Pearce
2008-09-05  5:18                 ` Junio C Hamano
2008-09-05  5:20                   ` Shawn O. Pearce
     [not found]                 ` <20080905045327.GA31166-o8xcbExO1WpAfugRpC6u6w@public.gmane.org>
2008-09-05 19:27                   ` Alexander Gladysh
2008-09-15  7:08                 ` Johannes Sixt
2010-11-30 21:19                   ` Bert Wesarg
2010-11-30 22:20                     ` Bert Wesarg
2010-12-06 21:30                       ` Bert Wesarg
2008-09-15 14:21                 ` Alexander Gladysh
     [not found]                   ` <c6c947f60809150721m1ec11f10xc68ce39559398659-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2008-09-15 14:24                     ` Shawn O. Pearce [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080915142421.GE6320@spearce.org \
    --to=spearce-o8xcbexo1wpafugrpc6u6w@public.gmane.org \
    --cc=agladysh-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    --cc=git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=git-users-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.