From: Jonathan Nieder <jrnieder@gmail.com>
To: Piotr Krukowiecki <piotr.krukowiecki.news@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: Consistent terminology: cached/staged/index
Date: Mon, 14 Feb 2011 17:19:20 -0600 [thread overview]
Message-ID: <20110214231920.GA24814@elie> (raw)
In-Reply-To: <AANLkTim4UKxYwRagCk3R20e7wsRb7CxvS_ze9b8MfWjL@mail.gmail.com>
Hi again,
Piotr Krukowiecki wrote:
> In other places "index" is called "staging area" and act of updating the index
> is called "staging in the index".
>
> I ask: why do we need the "index" term at all?
>
> - instead of "index" use "staging" and "staging area"
> - instead of "listed in index" use "staged" or "tracked"
Unlike "staging area", the word "index" is unfamiliar and opaque. So
there is a sense that there is something to learn.
When people talk about the staging area I tend to get confused. I
think there's an idea that because it sounds more concrete, there is
less to explain --- or maybe I am just wired the wrong way.
There is a .git/index file, with a well defined file format. And
there is an in-core copy of the index, too. It contains:
- mode and blob name for paths as requested by the user with
"git add"
- competing versions for paths whose proposed content is
uncertain during a merge
- stat(2) information to speed up comparison with the worktree
There are some other pieces, too --- "intent-to-add" entries added
with "git add -N", cached tree names for unmodified subtrees to
speed up "git commit", and so on. But the 3 pieces listed above are
the main thing.
"Staging area" only describes the first.
All that said, I am not against formulations like "content of the next
commit" that might be more concrete from a user's point of view.
[...]
> --refresh::
> Don't add the file(s), but only refresh their stat()
> - information in the index.
> + information in the staging area.
git add/update-index --refresh are precisely meant for _not_ changing
the content of the next commit, so this particular change seems
confusing.
Hoping that is clearer. Thanks for caring.
Jonathan
next prev parent reply other threads:[~2011-02-14 23:19 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-13 19:20 Consistent terminology: cached/staged/index Piotr Krukowiecki
2011-02-13 19:37 ` Jonathan Nieder
2011-02-13 22:58 ` Junio C Hamano
2011-02-14 2:05 ` Miles Bader
2011-02-14 5:57 ` Junio C Hamano
2011-02-14 6:27 ` Miles Bader
2011-02-14 6:59 ` Johannes Sixt
2011-02-14 7:07 ` Miles Bader
2011-02-14 10:42 ` Michael J Gruber
2011-02-14 11:04 ` Miles Bader
2011-02-14 17:12 ` Junio C Hamano
2011-02-14 22:07 ` Miles Bader
2011-02-14 22:59 ` Junio C Hamano
2011-02-14 23:47 ` Miles Bader
2011-02-15 0:12 ` Junio C Hamano
2011-02-14 13:14 ` Nguyen Thai Ngoc Duy
2011-02-14 13:43 ` Michael J Gruber
2011-02-14 13:57 ` Nguyen Thai Ngoc Duy
2011-02-14 14:17 ` Felipe Contreras
2011-02-14 14:21 ` Nguyen Thai Ngoc Duy
2011-02-14 14:40 ` Jakub Narebski
2011-02-14 15:24 ` Michael J Gruber
2011-02-14 16:00 ` Felipe Contreras
2011-02-14 16:04 ` Michael J Gruber
2011-02-14 16:27 ` Felipe Contreras
2011-02-14 3:09 ` Pete Harlan
2011-02-16 23:11 ` Drew Northup
2011-02-26 20:36 ` Felipe Contreras
2011-02-27 15:30 ` Drew Northup
2011-02-27 21:16 ` Aghiles
2011-02-28 20:53 ` Drew Northup
2011-02-14 22:32 ` Piotr Krukowiecki
2011-02-14 23:19 ` Jonathan Nieder [this message]
2011-02-15 8:29 ` Pete Harlan
2011-02-15 9:00 ` Jonathan Nieder
2011-02-15 18:15 ` Piotr Krukowiecki
2011-02-15 18:38 ` Jonathan Nieder
2011-02-26 21:09 ` Felipe Contreras
2011-02-26 21:51 ` Jonathan Nieder
2011-02-27 0:01 ` Miles Bader
2011-02-27 0:16 ` Felipe Contreras
2011-02-27 0:46 ` Jonathan Nieder
2011-02-27 8:15 ` Junio C Hamano
2011-02-27 8:43 ` Jeff King
2011-02-27 9:21 ` Miles Bader
2011-02-27 22:28 ` Jon Seymour
2011-02-27 23:57 ` Junio C Hamano
2011-02-28 9:38 ` Michael J Gruber
2011-02-27 15:34 ` Drew Northup
2011-02-28 23:03 ` Jeff King
2011-03-01 9:11 ` David
2011-03-01 9:15 ` Matthieu Moy
2011-03-01 9:32 ` Alexei Sholik
2011-03-01 17:02 ` Drew Northup
2011-03-01 17:30 ` Alexei Sholik
2011-03-01 17:41 ` Drew Northup
2011-03-01 9:27 ` Alexey Feldgendler
2011-03-01 16:46 ` Drew Northup
2011-03-04 17:18 ` Felipe Contreras
2011-03-05 4:53 ` Miles Bader
2011-03-05 5:00 ` Jonathan Nieder
2011-03-06 12:44 ` Drew Northup
[not found] ` <878466.93199.1298934204331.JavaMail.trustmail@mail1.terreactive.ch>
2011-03-01 8:43 ` Victor Engmark
2011-02-27 18:46 ` Phil Hord
2011-03-01 10:29 ` Jonathan Nieder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110214231920.GA24814@elie \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=piotr.krukowiecki.news@gmail.com \
/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.
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 NNTP newsgroup(s).