Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Git GUI / Gitk 2.6.1 : Stage Lines fails with patch error when byte 0xA9 is in file #515

Closed
clone opened this issue Oct 30, 2015 · 6 comments
Closed

Git GUI / Gitk 2.6.1 : Stage Lines fails with patch error when byte 0xA9 is in file #515

clone opened this issue Oct 30, 2015 · 6 comments
Labels
git-upstream mcve-required question

Comments

@clone
Copy link

clone commented Oct 30, 2015

I tried to stage lines from within the Git GUI / Gitk tool in a particular file.
I got a strange patch error, and staging lines was impossible.
Just committing the file worked fine.
When examing the file, it contained a 0xA9 byte (copyright symbol).
When I removed that, and tried again, I could stage lines without any errors.
@dscho
Copy link
Member

dscho commented Nov 1, 2015

As far as I can tell, 0xa9 refers to the copyright symbol only in ISO-8859-1 and ISO-8859-15. That is a very narrow, biased view on things, yet still legitimate. Legitimate if you tell Git (GUI) that your expected encoding is ISO-8859-1 (the standard these days is not ISO-8859-1 but UTF-8).

I suspect that this encoding has not been set. See e.g. gui.encoding in http://git-scm.com/docs/git-config.

Further, I suspect that this problem is not even specific to Windows, so it should be reported to the Git mailing list instead.

And lastly, it is so much easier to help when being provided with a Minimal, Complete & Verifiable Example. Therefore I would highly recommend coming up with such an example.

@clone
Copy link
Author

clone commented Nov 2, 2015

As far as I can tell, |0xa9| refers to the copyright symbol only in ISO-8859-1 and ISO-8859-15. That is a very narrow, biased view on things, yet still legitimate. Legitimate if you tell Git (GUI) that your expected encoding is ISO-8859-1 (the standard these days is /not/ ISO-8859-1 but UTF-8).

Sure it's a narrow view, that's how the target application wants to interpret this file. I understand your remark, but it is not directly related to the reported problem.

I suspect that this encoding has not been set. See e.g. |gui.encoding| in http://git-scm.com/docs/git-config.

gui.encoding=utf-8

This is what I usually use. In this case, (only) this file MUST use ISO-8859-1. Even so, the GUI does show a copyright symbol. Furthermore, as I understand it, GUI encodings are about interpreting the symbols by the GUI. I don't mind if it would have been rendered incorrectly, but I do mind that I cannot use 'stage lines'. And the error is not reported by the GUI, but by the patch tool(?).

Further, I suspect that this problem is not even specific to Windows, so it should be reported to the Git mailing list mailto:git@vger.kernel.org instead.

Might be, but I can only report the issue I see, I don't know what its cause is.

And lastly, it is /so/ much easier to help when being provided with a Minimal, Complete & Verifiable Example http://stackoverflow.com/help/mcve. Therefore I would /highly/ recommend coming up with such an example.

The provided link points to creating a CVE for code. My report is not about code.
I clearly gave the steps to reproduce the problem on my side.
If you need extra information I will be glad to help out.

As extra information, I created a new archive, added an innocent file, committed.
Then added 1 0xA9 character. Git diff from the command-line shows

test ISO-8859-1 characters.
+<A9>

so no problem there.
Git GUI shows a copyright symbol in green (=added), so no problem either.
If I do a 'stage line' on that, I get

'fatal: corrupt patch at line 5'

A slightly different error message from the one I saw earlier, but still 'stage line' fails.
Git add and commit succeeds.
Adding another line, git diff

test ISO-8859-1 characters.
-<A9>
\ No newline at end of file
+<A9>
+test ISO-8859-1 characters.
\ No newline at end of file

No problem again. A similar view is shown in Git GUI, but with a copyright symbol.
If I 'stage line' on the last line only, I again get an error message

error: patch failed t:1
error: t: patch does not apply

Which was the same as the error message I saw from my initial description.

So it seems my description on how to reproduce it, was quite to the point.
Hope this helps to find and solve the issue.

Thanks!

@dscho
Copy link
Member

dscho commented Feb 16, 2016

So it seems my description on how to reproduce it, was quite to the point.

I will bite the bullet and try to reproduce here. For future record: I can work quicker on any bug when there is a repository that I can clone readily, and that has the minimal set of files/revisions to reproduce the problem.

@dscho dscho closed this as completed in a5f5835 Feb 16, 2016
@dscho
Copy link
Member

dscho commented Feb 16, 2016

Note that the 0xA9 was a red herring. The bug happened with any string on the second line. Read: it should not have been a part of a Minimal, Complete & Verifiable Example.

@clone
Copy link
Author

clone commented Feb 17, 2016

My original example had multiple lines to be staged. When it contained 0xA9 it would not stage, when I removed it, it would. Did not seem like a red herring to me.

@dscho
Copy link
Member

dscho commented Feb 17, 2016

My original example had multiple lines to be staged. When it contained 0xA9 it would not stage, when I removed it, it would. Did not seem like a red herring to me.

Well, when I tried to reproduce, it turned out that it was a red herring. So maybe you did not try to reduce the problematic condition hard enough?

dscho added a commit to git-for-windows/build-extra that referenced this issue Feb 18, 2016
@dscho
Mention Bug Fix in release notes
5bd0f8c 
Git GUI learned to [stage lines appended to a single-line
file](git-for-windows/git#515).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Feb 23, 2016
@dscho
git gui: fix staging a second line to a 1-line file
781f3c4 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Mar 15, 2016
@dscho
git gui: fix staging a second line to a 1-line file
f37950e 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Mar 18, 2016
@dscho
git gui: fix staging a second line to a 1-line file
823347e 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Mar 29, 2016
@dscho
git gui: fix staging a second line to a 1-line file
1cf0d2e 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Apr 4, 2016
@dscho
git gui: fix staging a second line to a 1-line file
5670e10 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Apr 30, 2016
@dscho
git gui: fix staging a second line to a 1-line file
7f0849c 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue May 20, 2016
@dscho
git gui: fix staging a second line to a 1-line file
119cf22 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit to dscho/git that referenced this issue May 27, 2016
@dscho
git gui: fix staging a second line to a 1-line file
51892a7 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes git-for-windows#515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Jun 7, 2016
@dscho
git gui: fix staging a second line to a 1-line file
5dfcb78 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Jun 9, 2016
@dscho
git gui: fix staging a second line to a 1-line file
042f0b2 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Jun 9, 2016
@dscho
git gui: fix staging a second line to a 1-line file
18ac0ed 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Jun 9, 2016
@dscho
git gui: fix staging a second line to a 1-line file
09a9500 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Jun 9, 2016
@dscho
git gui: fix staging a second line to a 1-line file
b242f3b 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Jun 14, 2016
@dscho
git gui: fix staging a second line to a 1-line file
6edaa49 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Jul 12, 2016
@dscho
git gui: fix staging a second line to a 1-line file
902f300 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Jul 16, 2016
@dscho
git gui: fix staging a second line to a 1-line file
d8342c7 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Sep 26, 2017
@dscho
git gui: fix staging a second line to a 1-line file
a53e4d5 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Oct 17, 2017
@dscho
git gui: fix staging a second line to a 1-line file
39ae4a6 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Oct 19, 2017
@dscho
git gui: fix staging a second line to a 1-line file
3e8e1a6 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Oct 19, 2017
@dscho
git gui: fix staging a second line to a 1-line file
95c3ffb 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Oct 19, 2017
@dscho
git gui: fix staging a second line to a 1-line file
f55ad15 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Oct 19, 2017
@dscho
git gui: fix staging a second line to a 1-line file
376123f 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Oct 19, 2017
@dscho
git gui: fix staging a second line to a 1-line file
f8caa73 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
git-for-windows-ci pushed a commit that referenced this issue Oct 20, 2017
@dscho
git gui: fix staging a second line to a 1-line file
5cb35fb 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
git-for-windows-ci pushed a commit that referenced this issue Oct 20, 2017
@dscho
git gui: fix staging a second line to a 1-line file
4339ebe 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
git-for-windows-ci pushed a commit that referenced this issue Oct 20, 2017
@dscho
git gui: fix staging a second line to a 1-line file
3a0e9eb 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Oct 20, 2017
@dscho
git gui: fix staging a second line to a 1-line file
6d93f0b 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
git-for-windows-ci pushed a commit that referenced this issue Oct 21, 2017
@dscho
git gui: fix staging a second line to a 1-line file
86df1f8 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Oct 23, 2017
@dscho
git gui: fix staging a second line to a 1-line file
79f084e 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
git-for-windows-ci pushed a commit that referenced this issue Oct 24, 2017
@dscho
git gui: fix staging a second line to a 1-line file
d36fad4 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Oct 30, 2017
@dscho
git gui: fix staging a second line to a 1-line file
ff0c2c3 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Nov 1, 2017
@dscho
git gui: fix staging a second line to a 1-line file
6a639b2 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Nov 6, 2017
@dscho
git gui: fix staging a second line to a 1-line file
5828a73 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
git-for-windows-ci pushed a commit that referenced this issue Nov 7, 2017
@dscho
git gui: fix staging a second line to a 1-line file
3747c83 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Nov 29, 2017
@dscho
git gui: fix staging a second line to a 1-line file
3a8c77f 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
git-for-windows-ci pushed a commit that referenced this issue Dec 6, 2017
@dscho
git gui: fix staging a second line to a 1-line file
bd94f95 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit that referenced this issue Jan 2, 2018
@dscho
git gui: fix staging a second line to a 1-line file
26e9087 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes #515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit to dscho/git that referenced this issue Jan 9, 2018
@dscho
git gui: fix staging a second line to a 1-line file
35fabf9 
When a 1-line file is augmented by a second line, and the user tries to
stage that single line via the "Stage Line" context menu item, we do not
want to see "apply: corrupt patch at line 5".

The reason for this error was that the hunk header looks like this:

	@@ -1 +1,2 @@

but the existing code expects the original range always to contain a
comma. This problem is easily fixed by cutting the string "1 +1,2"
(that Git GUI formerly mistook for the starting line) at the space.

This fixes git-for-windows#515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho mentioned this issue Sep 19, 2019
Closed
@dscho dscho mentioned this issue Sep 26, 2019
Closed
dscho pushed a commit to dscho/git that referenced this issue Jul 26, 2022
@derrickstolee @dscho
Merge pull request git-for-windows#515 from derrickstolee/scalar-docs
d4f89e0 
scalar: put docs back where they are expected
dscho pushed a commit to dscho/git that referenced this issue Aug 18, 2022
@derrickstolee @vdye
Merge pull request git-for-windows#515 from derrickstolee/scalar-docs
2c8b21f 
scalar: put docs back where they are expected
dscho pushed a commit to dscho/git that referenced this issue Sep 16, 2022
@derrickstolee @dscho
Merge pull request git-for-windows#515 from derrickstolee/scalar-docs
7843695 
scalar: put docs back where they are expected
dscho pushed a commit to dscho/git that referenced this issue Sep 16, 2022
@derrickstolee @dscho
Merge pull request git-for-windows#515 from derrickstolee/scalar-docs
262a1d7 
scalar: put docs back where they are expected
dscho pushed a commit to dscho/git that referenced this issue Sep 19, 2022
@derrickstolee @dscho
Merge pull request git-for-windows#515 from derrickstolee/scalar-docs
bd388be 
scalar: put docs back where they are expected
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
git-upstream mcve-required question
Projects
None yet
Milestone
No milestone
2 participants
@dscho @clone