Am Mittwoch, den 08.01.2020, 04:11 -0500 schrieb Jeff King:
> That step seems wrong, and I can't reproduce it here. If "git status"
> lists the files as unstaged, then "git commit" should not be
> committing
> them. Can you show us a more complete example that we can run
> ourselves
> (i.e., that does not rely on whatever is in "main", and what is in
> $FILES)? Barring that, can you show us the output of the commands, as
> well as "git show FETCH_HEAD FETCH_HEAD~1"?
>
> -Peff
Hi Jeff, I have a poc you can try:
cd /tmp
mkdir testrepo
cd testrepo
touch TEST1 TEST2
git add -A
git commit -m First
touch TEST3 TEST4
git add -A
git commit -m Second
git reset --soft HEAD~1
git status
Auf Branch master
Zum Commit vorgemerkte Änderungen:
(benutzen Sie "git restore --staged <Datei>..." zum Entfernen aus
der Staging-Area)
neue Datei: TEST3
neue Datei: TEST4
git restore --staged TEST3
[10:57:26][tkrah@torstenknbl:/tmp/testrepo] (master) $ LC_ALL=C git
status
On branch master
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
new file: TEST4
Untracked files:
(use "git add <file>..." to include in what will be committed)
TEST3
git commit -m Second
[master 5b62331] Second
2 files changed, 0 insertions(+), 0
deletions(-)
create mode 100644 TEST3
create mode 100644 TEST4
And now TEST3 is in the commit and what is even more "interesting" is
the next one:
[10:59:16][tkrah@torstenknbl:/tmp/testrepo] (master) $ LC_ALL=C git
status
On branch master
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
deleted: TEST3
Untracked files:
(use "git add <file>..." to include in what will be committed)
TEST3
TEST3 is unstaged and deleted now.
This seems wrong - or did I something wrong?
Cheers
Torsten
--
Mit freundlichen Grüßen / Best regards
Torsten Krah
mgm technology partners GmbH
Neumarkt 2
04109 Leipzig
Tel. +49 (341) 339 893-539
E-Mail Torsten.Krah@xxxxxxxxxx
Innovation Implemented.
Geschäftsführer / CEO: Hamarz Mehmanesh
Sitz der Gesellschaft / Registered office: München
Handelsregister/ Commercial register: AG München HRB 161298
USt-IdNr. / VAT ID: DE815309575
