git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
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 11:44:23 -0700	[thread overview]
Message-ID: <xmqq1qqtm7i0.fsf@gitster.g> (raw)
In-Reply-To: <CAB9Jk9BC1PVxuuNggZuDh1OMe3kdTvCzwkoo7Bkm35nRqAaL4g@mail.gmail.com> (Angelo Borsotti's message of "Thu, 27 Oct 2022 19:46:52 +0200")

Angelo Borsotti <angelo.borsotti@gmail.com> writes:

> Hi
>
> I have displayed the contents of the commits with the command you indicate,
> but they still look much the same:
>
> D:\gittest>git ls-tree -r --name-only 91ef45d
> C1.java
> C2.java
> C3.java
> C4.java
> C5.java
>
>
> D:\gittest>git ls-tree -r --name-only 8ec0c2f
> C1.java
> C2.java
> C3.java
> C4.java
> C5.java
>
> I thought that in the second one I would see only the changed file.

Git tracks contents.  What it means is that you should stop thinking
in terms of "changed files".  Each commit (and its tree) represents
a complete snapshot.  Back when you created 8ec0c2f, did you or did
you not have C1.java?  You said you did not modify it, so I assume
you did have it.  As a commit is a complete snapshot of the
contents, when you list the contents of 8ec0c2f, it should be
included.

To put it another way, if you "git checkout --detach 8ec0c2f" in
order to go back to the state you were back when you created that
commit, do you or do you not want to see C1.java and C2.java?  In
order to be able to reproduce the then-current state, of course
you do want to see, and because each commit is a complete snapshot,
you can see C1 and C2.

"git add C1.java" is a way to make sure that, if you make a commit,
the resulting "snapshot" includes the current contents stored in the
C1.java file as you have on the filesystem at the time of issuing
"git add" command.  If you made or did not make changes to C1.java
before running "git add C1.java" is immaterial.  We may optimize out
and make it a no-op if we know you did not make any changes, but it
does not change the fact that the resulting commit will store, and
more importantly, you will be able to recover, the then-current
contents of C1.java out of that commit.

  reply	other threads:[~2022-10-27 18:44 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
2022-10-27 17:46           ` Angelo Borsotti
2022-10-27 18:44             ` Junio C Hamano [this message]
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=xmqq1qqtm7i0.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).