mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <>
Cc: Junio C Hamano <>
Subject: [PATCH 1/4] git gui: fix staging a second line to a 1-line file
Date: Tue, 9 Jan 2018 15:32:54 +0100 (STD)	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

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

Signed-off-by: Johannes Schindelin <>
 git-gui/lib/diff.tcl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 4cae10a4c7f..68c4a6c7366 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -698,6 +698,7 @@ proc apply_range_or_line {x y} {
 		set hh [$ui_diff get $i_l "$i_l + 1 lines"]
 		set hh [lindex [split $hh ,] 0]
 		set hln [lindex [split $hh -] 1]
+		set hln [lindex [split $hln " "] 0]
 		# There is a special situation to take care of. Consider this
 		# hunk:

  reply	other threads:[~2018-01-09 14:33 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-09 14:32 [PATCH 0/4] "Fast-"track Git GUI changes Johannes Schindelin
2018-01-09 14:32 ` Johannes Schindelin [this message]
2018-01-09 14:32 ` [PATCH 2/4] git-gui: avoid exception upon Ctrl+T in an empty list Johannes Schindelin
2018-01-09 14:33 ` [PATCH 3/4] git-gui: fix exception when trying to stage with empty file list Johannes Schindelin
2018-01-09 14:33 ` [PATCH 4/4] git-gui: allow Ctrl+T to toggle multiple paths Johannes Schindelin
2018-01-09 19:01 ` [PATCH 0/4] "Fast-"track Git GUI changes Junio C Hamano
2018-01-09 19:09   ` Junio C Hamano
2018-01-10 14:30     ` Johannes Schindelin

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:

  List information:

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

  git send-email \ \ \ \ \

* 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.
Code repositories for project(s) associated with this public inbox

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 read-only IMAP folder(s) and NNTP newsgroup(s).