From: Johannes Sixt <j.sixt@viscovery.net>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Alexander Gladysh <agladysh@gmail.com>,
git-users@googlegroups.com, git@vger.kernel.org
Subject: Re: Git Gui does not want to work on chunk level
Date: Mon, 15 Sep 2008 09:08:31 +0200 [thread overview]
Message-ID: <48CE09EF.7090609@viscovery.net> (raw)
In-Reply-To: <20080905045327.GA31166@spearce.org>
Shawn O. Pearce schrieb:
> git-gui: Fix diff parsing for lines starting with "--" or "++"
>
> Languages like Lua and SQL use "--" to mark a line as commented out.
> If this appears at column 0 and is part of the pre-image we may see
> "--- foo" in the diff, indicating that the line whose content is
> "-- foo" has been removed from the new version.
>
> git-gui was incorrectly parsing "--- foo" as the old file name
> in the file header, causing it to generate a bad patch file when
> the user tried to stage or unstage a hunk or the selected line.
> We need to keep track of where we are in the parsing so that we do
> not misread a deletion or addition record as part of the header.
This (slightly) breaks parsing of new files and removed files that are
staged by showing the file names in the diff header:
new file mode 100644
--- /dev/null
+++ b/foo
@@ -0,0 +1 @@
+foo
-- Hannes
next prev parent reply other threads:[~2008-09-15 7:11 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 [this message]
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
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=48CE09EF.7090609@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=agladysh@gmail.com \
--cc=git-users@googlegroups.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).