From: Torsten Krah <krah.tm@gmail.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Broken branch after git commit - tracked files in staging area can't be removed with restore --staged, or commit or stash
Date: Wed, 08 Jan 2020 11:02:41 +0100 [thread overview]
Message-ID: <2423f8c0b91578c0faf7527b7d97b0e1e9666261.camel@gmail.com> (raw)
In-Reply-To: <20200108091119.GB87523@coredump.intra.peff.net>
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@mgm-tp.com
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
next prev parent reply other threads:[~2020-01-08 10:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 12:55 Broken branch after git commit - tracked files in staging area can't be removed with restore --staged, or commit or stash Torsten Krah
2020-01-07 13:43 ` Torsten Krah
2020-01-07 15:28 ` Torsten Krah
2020-01-08 9:11 ` Jeff King
2020-01-08 10:02 ` Torsten Krah [this message]
2020-01-08 10:31 ` Torsten Krah
2020-01-08 10:40 ` Jeff King
2020-01-08 11:43 ` [PATCH] restore: invalidate cache-tree when removing entries with --staged Jeff King
2020-01-08 15:41 ` Junio C Hamano
2020-02-05 20:24 ` Dennis Kaarsemaker
2020-01-08 12:42 ` Broken branch after git commit - tracked files in staging area can't be removed with restore --staged, or commit or stash Torsten Krah
2020-01-09 9:39 ` Jeff King
2020-01-09 10:49 ` Torsten Krah
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=2423f8c0b91578c0faf7527b7d97b0e1e9666261.camel@gmail.com \
--to=krah.tm@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.
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).