git-for-windows/git: A fork of Git containing Windows-specific patches. - git

mirror of https://github.com/git-for-windows/git.git synced 2026-04-20 17:54:13 -05:00

Go to file

Johannes Schindelin 6d02c1e204 git gui: fix staging a second line to a 1-line file

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 https://github.com/git-for-windows/git/issues/515

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2018-01-09 11:02:40 -08:00

lib

git gui: fix staging a second line to a 1-line file

2018-01-09 11:02:40 -08:00

macosx

git-gui: Make git-gui lib dir configurable at runime

2014-08-10 12:48:28 +01:00

git-gui i18n: Updated Bulgarian translation (565,0f,0u)

2016-10-20 11:12:50 +01:00

windows

git-gui: chmod +x po2msg, windows/git-gui.sh

2014-01-18 17:06:41 +00:00