From: Thomas Sullivan <tom@msbit.com.au>
To: git@vger.kernel.org
Subject: git add intent-to-add then git add patch no longer allows edit
Date: Fri, 21 Aug 2020 14:27:23 +1000 [thread overview]
Message-ID: <CAB+jsAW_+NTJjDLG9uMrf4cc5rcwHLD5kTLk7QgvFCgryb22Gw@mail.gmail.com> (raw)
What did you do before the bug happened? (Steps to reproduce your issue)
rm -rf .git
cat << EOF > file
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor incididunt ut labore et dolore magna aliqua.
EOF
git init .
git add --intent-to-add file
git add --patch file
What did you expect to happen? (Expected behavior)
To be able to edit the single hunk (`e` option)
What happened instead? (Actual behavior)
The `e` option isn't available (and providing it anyway errors with
`Sorry, cannot edit this hunk`)
Anything else you want to add:
Output of version 2.28.0:
diff --git a/file b/file
index 0000000..85e73d4
--- /dev/null
+++ b/file
new file mode 100644
@@ -0,0 +1 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor incididunt ut labore et dolore magna aliqua.
(1/1) Stage addition [y,n,q,a,d,?]?
Output of version 2.27.0:
diff --git a/file b/file
index e69de29..85e73d4 100644
--- a/file
+++ b/file
@@ -0,0 +1 @@
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor incididunt ut labore et dolore magna aliqua.
(1/1) Stage this hunk [y,n,q,a,d,e,?]?
Bisecting between the two tags reports this commit as the one
introducing the change:
[feea6946a5b746ff4ebf8ccdf959e303203a6011] diff-files: treat
"i-t-a" files as "not-in-index"
[System Info]
git version:
git version 2.28.0
cpu: x86_64
no commit associated with this build
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh
uname: Darwin 17.7.0 Darwin Kernel Version 17.7.0: Thu Jun 18 21:21:34
PDT 2020; root:xnu-4570.71.82.5~1/RELEASE_X86_64 x86_64
compiler info: clang: 10.0.0 (clang-1000.10.44.4)
libc info: no libc information available
$SHELL (typically, interactive shell): /bin/bash
[Enabled Hooks]
Regards,
Tom Sullivan
Head Developer
Most Significant Bit Software
e: tom@msbit.com.au
p: +61 407 890 821
next reply other threads:[~2020-08-21 4:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-21 4:27 Thomas Sullivan [this message]
2020-08-21 5:25 ` git add intent-to-add then git add patch no longer allows edit Raymond E. Pasco
2020-08-21 16:27 ` Junio C Hamano
2020-08-23 16:03 ` Phillip Wood
2020-08-24 16:23 ` Raymond E. Pasco
2020-08-24 17:28 ` Phillip Wood
2020-08-24 21:03 ` Raymond E. Pasco
2020-09-04 10:05 ` Phillip Wood
2020-09-04 6:56 ` Johannes Schindelin
2020-09-06 17:10 ` Junio C Hamano
2020-09-07 18:00 ` Phillip Wood
2020-09-08 16:05 ` Junio C Hamano
2020-09-08 19:52 ` Johannes Schindelin
2020-09-08 22:00 ` Junio C Hamano
2020-09-09 9:40 ` Phillip Wood
2020-09-05 18:36 ` Raymond E. Pasco
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAB+jsAW_+NTJjDLG9uMrf4cc5rcwHLD5kTLk7QgvFCgryb22Gw@mail.gmail.com \
--to=tom@msbit.com.au \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).