From: Junio C Hamano <gitster@pobox.com>
To: Angelo Borsotti <angelo.borsotti@gmail.com>
Cc: Philip Oakley <philipoakley@iee.email>, Git List <git@vger.kernel.org>
Subject: Re: Git add documentation error
Date: Thu, 27 Oct 2022 10:28:52 -0700 [thread overview]
Message-ID: <xmqqo7txmazv.fsf@gitster.g> (raw)
In-Reply-To: <CAB9Jk9DPdVmmb2DPDKPm5FLGr-XJa5kNouCYmcjh534Y2z1rVQ@mail.gmail.com> (Angelo Borsotti's message of "Thu, 27 Oct 2022 18:57:21 +0200")
Angelo Borsotti <angelo.borsotti@gmail.com> writes:
> Then I displayed the contents of both commits, and seen that it is pretty much
> the same:
>
> D:\gittest>git show --pretty="" --name-only 91ef45d
> C2.java
>
> D:\gittest>git show --pretty="" --name-only 8ec0c2f
> C2.java
You did not display the contents of these commits, though. For each
of these commits, you checked the _difference_ between it and its
parent.
In the previous sequence
>> > I have tested this in the following way: I have two files: C1.java and C2.java
>> >
>> > > git status
>> > On branch master
>> > nothing added to commit
>> > > ... edit C2.java
>> > > git status
>> > On branch master
>> > Changes not staged for commit:
>> > (use "git add <file>..." to update what will be committed)
>> > (use "git restore <file>..." to discard changes in working directory)
>> > modified: C2.java
>> > > git add C1.java
>> > > git add C2.java
>> > > git commit -m "commit2"
>> > D:\gittest>git commit -m "commit1"
>> > [master 91ef45d] commit1
>> > 1 file changed, 1 insertion(+), 1 deletion(-)
91ef45d, relative to its parent (i.e. the previous state before the
commit was made), C2.java was modified. C1.java was not.
So, what you saw
> D:\gittest>git show --pretty="" --name-only 91ef45d
> C2.java
is very much consistent with what you did. And the above does not
mean 91ef45d does not have C1.java. If you want to "display" the
contents of commit 91ef45d, you could
$ git ls-tree -r --name-only 91ef45d
which lists all the contents in commit 91ef45d
or
$ git diff --name-only $(git hash-object --stdin -t tree </dev/null) 91ef45d
which compares all the contents in commit 91ef45d with a completely
empty tree.
In them, you'd see both C1 and C2, among other things that you did
not modify in 91ef45d.
next prev parent reply other threads:[~2022-10-27 17:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-27 11:53 Git add documentation error Angelo Borsotti
2022-10-27 15:10 ` Philip Oakley
[not found] ` <CAB9Jk9BBddd5d0wKFB0eJw1OMMAQj88J9Bn1Yn1rbK_F1mEs1A@mail.gmail.com>
2022-10-27 16:16 ` Philip Oakley
2022-10-27 16:57 ` Angelo Borsotti
2022-10-27 17:28 ` Junio C Hamano [this message]
2022-10-27 17:46 ` Angelo Borsotti
2022-10-27 18:44 ` Junio C Hamano
2022-10-27 19:15 ` Angelo Borsotti
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=xmqqo7txmazv.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=angelo.borsotti@gmail.com \
--cc=git@vger.kernel.org \
--cc=philipoakley@iee.email \
/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).