git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ilya Tumaykin <itumaykin@gmail.com>
To: git@vger.kernel.org
Subject: git crashes in `git commit --patch` with diff.suppressBlankEmpty = true
Date: Wed, 3 Jul 2024 17:41:40 +0300	[thread overview]
Message-ID: <9b31e86f-c408-4625-8d13-f48a209b541b@gmail.com> (raw)

Hello.

`git commit --patch` crashes with diff.suppressBlankEmpty option enabled 
under certain conditions.


Steps to reproduce:
1. Prepare .gitconfig:
[user]
	name = User
	email = user@example.com
[diff]
	suppressBlankEmpty = true

2. Initialize repo:
$ mkdir git_bug && cd git_bug
$ git init
$ echo -e 'test\n\n test \n\ntest' > test.txt
$ git add test.txt
$ git commit test.txt -m 'initial'

3. Make changes:
$ echo -e 'test\n\n test\ntest\n \n' > test.txt

4. Try to commit new changes
$ git commit --patch test.txt

5. Try to split the first hunk, press 's' in the git-commit interactive 
interface.


Actual results:
diff --git a/test.txt b/test.txt
index 366cd4b..611ca9d 100644
--- a/test.txt
+++ b/test.txt
@@ -1,5 +1,6 @@
  test

- test
-
+ test
  test
+
+
(1/1) Stage this hunk [y,n,q,a,d,s,e,p,?]? s
BUG: add-patch.c:994: unhandled diff marker: '
'
Aborted (core dumped)


Expected results:
git-commit splits the hunk and continues.


Comment:
If I set diff.suppressBlankEmpty = false, then I get the expected behavior.

git --version: 2.45.2
OS: up-to-date Fedora 40

-- 
Best regards.
Ilya Tumaykin.

             reply	other threads:[~2024-07-03 14:41 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-03 14:41 Ilya Tumaykin [this message]
2024-07-04 13:14 ` git crashes in `git commit --patch` with diff.suppressBlankEmpty = true Phillip Wood
2024-07-05 16:39   ` Junio C Hamano
2024-07-10  9:36     ` [RFC/PATCH] add-patch: handle splitting hunks with diff.suppressBlankEmpty Jeff King
2024-07-10 13:46       ` Phillip Wood
2024-07-11 21:26         ` Jeff King
2024-07-13 13:19           ` phillip.wood123
2024-07-13 21:21             ` Jeff King
2024-07-18 14:22               ` Phillip Wood
2024-07-18 14:23           ` Phillip Wood
2024-07-10 17:06       ` Junio C Hamano
2024-07-11 21:32         ` Jeff King

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=9b31e86f-c408-4625-8d13-f48a209b541b@gmail.com \
    --to=itumaykin@gmail.com \
    --cc=git@vger.kernel.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).