From: Krzysztof Sobierajczyk <sobierajczyk.krzysztof@gmail.com>
To: git@vger.kernel.org
Subject: bug - git version 2.20.1.windows.1
Date: Fri, 22 Feb 2019 14:26:51 +0100 [thread overview]
Message-ID: <CAM3o+_mX6euHa8Trq5cArcYBc9Wm0FH2L56S6Z3ojdhTcc0CWQ@mail.gmail.com> (raw)
for example, I've created a simple repository. Containing two files
('to rename.txt' and 'to remove.txt'). I wanted to prepare for the
index changing the name of the first file and deleting the second
file. what git shows you looks wrong. Please check the four
instructions
$ git add .
$ git commit -m " first commit"
$ git mv to\ rename.txt new\ name.txt
$ git rm to\ remove.txt
SAMPLE REPOSITORY AND TEST
Untracked files:
(use "git add <file>..." to include in what will be committed)
to remove.txt
to rename.txt
nothing added to commit but untracked files present (use "git add" to track)
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ git add .
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ git status
On branch master
No commits yet
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: to remove.txt
new file: to rename.txt
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ git commit -m " first commit"
[master (root-commit) 46011e3] first commit
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 to remove.txt
create mode 100644 to rename.txt
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ git status
On branch master
nothing to commit, working tree clean
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ ls -all
total 8
drwxr-xr-x 1 ksobierajczyk 1049089 0 lut 22 13:40 ./
drwxr-xr-x 1 ksobierajczyk 1049089 0 lut 22 13:38 ../
drwxr-xr-x 1 ksobierajczyk 1049089 0 lut 22 13:41 .git/
-rw-r--r-- 1 ksobierajczyk 1049089 0 lut 22 13:38 'to remove.txt'
-rw-r--r-- 1 ksobierajczyk 1049089 0 lut 22 13:40 'to rename.txt'
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ git mv to\ rename.txt new\ name.txt
<--- rename
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
renamed: to rename.txt -> new name.txt
<--- rename is ok
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ ls -la
total 8
drwxr-xr-x 1 ksobierajczyk 1049089 0 lut 22 13:42 ./
drwxr-xr-x 1 ksobierajczyk 1049089 0 lut 22 13:38 ../
drwxr-xr-x 1 ksobierajczyk 1049089 0 lut 22 13:42 .git/
-rw-r--r-- 1 ksobierajczyk 1049089 0 lut 22 13:40 'new name.txt'
-rw-r--r-- 1 ksobierajczyk 1049089 0 lut 22 13:38 'to remove.txt'
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ git rm to\ remove.txt
<---- remove file
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
renamed: to remove.txt -> new name.txt
<------------ AND FAIL
deleted: to rename.txt
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ git commit -m"second commit"
[master 30beac5] second commit
2 files changed, 0 insertions(+), 0 deletions(-)
rename to remove.txt => new name.txt (100%)
delete mode 100644 to rename.txt
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ git status
On branch master
nothing to commit, working tree clean
ksobierajczyk@KME43 MINGW64 /d/Simple repository (master)
$ git show
commit 30beac5b0578d4e4b6e64ea3a3c9a323f14e6277 (HEAD -> master)
Author: Krzysztof Sobierajczyk <sobierajczyk.krzysztof@gmail.com>
Date: Fri Feb 22 13:45:21 2019 +0100
second commit
diff --git a/to remove.txt b/new name.txt
<------- Wrong information
similarity index 100%
rename from to remove.txt
rename to new name.txt
diff --git a/to rename.txt b/to rename.txt
deleted file mode 100644
index e69de29..0000000
next reply other threads:[~2019-02-22 13:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-22 13:26 Krzysztof Sobierajczyk [this message]
2019-02-22 14:10 ` bug - git version 2.20.1.windows.1 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
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=CAM3o+_mX6euHa8Trq5cArcYBc9Wm0FH2L56S6Z3ojdhTcc0CWQ@mail.gmail.com \
--to=sobierajczyk.krzysztof@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).