From: Daniel Barkalow <barkalow@iabervon.org>
To: git@vger.kernel.org
Cc: Junio C Hamano <junkio@cox.net>
Subject: [RFC] git-add update with all-0 object
Date: Thu, 30 Nov 2006 17:08:23 -0500 (EST) [thread overview]
Message-ID: <Pine.LNX.4.64.0611301634080.20138@iabervon.org> (raw)
One thing that I think is non-intuitive to a lot of users (either novice
or who just don't do it much) is that it matters where in the process you
do "git add <path>" if you're also changing the file. Even if you
understand the index, you may not realize (or may not have internalized
the fact) that what git-add does is update the index with what's there
now.
I think the more obvious behavior is to have it record the fact that you
want to have the path tracked, but require one of the usual updating
mechanisms to get a particular content into the index.
This should be pretty simple to implement: use --cacheinfo 0 0 $path
instead of --add -- $path, and teach programs that look at the objects
recorded in the index (rather than just hashes or other info) about all-0
hashes meaning "but no content there". write-tree would probably just
skip the entry (and then you could add a file, but still produce commits
without it until you actually do either an update-index explicitly or one
of the commit option sets that updates it); diff would treat it as empty;
checkout would ignore it.
-Daniel
next reply other threads:[~2006-11-30 22:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-30 22:08 Daniel Barkalow [this message]
2006-11-30 22:32 ` [RFC] git-add update with all-0 object Johannes Schindelin
2006-11-30 22:34 ` Nicolas Pitre
2006-11-30 22:41 ` Jakub Narebski
2006-11-30 22:49 ` Nicolas Pitre
2006-11-30 22:46 ` Linus Torvalds
2006-12-01 0:12 ` Daniel Barkalow
2006-12-01 4:57 ` Theodore Tso
2006-12-01 6:20 ` Junio C Hamano
2006-12-02 8:55 ` Jakub Narebski
2006-12-01 7:10 ` Linus Torvalds
2006-12-01 8:10 ` Daniel Barkalow
2006-12-01 9:37 ` Andy Parkins
2006-12-02 8:35 ` Jakub Narebski
2006-12-02 8:26 ` Jakub Narebski
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=Pine.LNX.4.64.0611301634080.20138@iabervon.org \
--to=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).