From: Linus Torvalds <torvalds@osdl.org>
To: Paul Jakma <paul@clubi.ie>
Cc: git list <git@vger.kernel.org>
Subject: Re: seperate commits for objects already updated in index?
Date: Tue, 14 Mar 2006 09:20:22 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0603140915290.3618@g5.osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0603141703080.5276@sheen.jakma.org>
On Tue, 14 Mar 2006, Paul Jakma wrote:
> On Tue, 14 Mar 2006, Linus Torvalds wrote:
>
> > The simplest thing to do is to do
> >
> > git reset
> >
> > to reset your index back to your HEAD (but obviously DON'T use the "-f"
> > flag, which will also force the working tree!).
>
> Ah, of course! (I knew I was being dumb ;) ).
Well, I actually think git is being somewhat of an ass, for no really good
reason. It's true that you are doing something pretty strange by _both_
using "git-update-index" and "git commit -o" but the fact is, at least
when adding files, that would be expected (ie you have to mark a file
in the index to add it).
I also think that test is historical, from before Junio cleaned up how
"git commit" worked - it _used_ to be that "git commit" would work in the
current index, but these days it generates a new index to commit when you
do "-o", so there's really no _technical_ reason to refuse the partial
commit any more as far as I can see.
So I don't know. I don't think you were being dumb, I think git could have
been friendlier to you.
Linus
next prev parent reply other threads:[~2006-03-14 17:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-14 16:37 seperate commits for objects already updated in index? Paul Jakma
2006-03-14 17:00 ` Linus Torvalds
2006-03-14 17:04 ` Paul Jakma
2006-03-14 17:20 ` Linus Torvalds [this message]
2006-03-14 17:27 ` Paul Jakma
2006-03-14 23:51 ` Junio C Hamano
2006-03-15 3:24 ` Junio C Hamano
2006-03-15 13:28 ` Paul Jakma
2006-03-15 14:00 ` Andreas Ericsson
2006-03-15 19:25 ` Junio C Hamano
2006-03-15 19:43 ` Andreas Ericsson
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.0603140915290.3618@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=paul@clubi.ie \
/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).