git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Kristian Høgsberg" <krh@redhat.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH] builtin-commit: Refresh cache after adding files.
Date: Fri, 09 Nov 2007 12:38:13 -0500	[thread overview]
Message-ID: <1194629893.30909.12.camel@hinata.boston.redhat.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0711091722520.4362@racer.site>

On Fri, 2007-11-09 at 17:24 +0000, Johannes Schindelin wrote:
> Hi,
> 
> On Fri, 9 Nov 2007, Kristian H?gsberg wrote:
> 
> > On Fri, 2007-11-09 at 17:05 +0000, Johannes Schindelin wrote:
> > 
> > > On Fri, 9 Nov 2007, Kristian Høgsberg wrote:
> > > 
> > > > This fixes the race in the last test int t3700.
> > > 
> > > Well, it is not a race.  My fault.  I thought it was.
> > > 
> > > What you basically did was to make sure that the index is up-to-date 
> > > after adding the files.  You might even want to say that in the commit 
> > > message, and only then say that it fixes t3700, too.
> > 
> > OK, I guess what I was wondering was why write_cache() doesn't write out
> > an up-to-date index.
> 
> write_cache() only writes the index, it does not update it.
> 
> > Do we need a call to refresh_cache() when we update the user cache but 
> > commit an index created from read_tree+add_files?  I.e. after the 
> > add_files_to_index() call on line 97?  The shell script doesn't do this, 
> > it only runs update-index --refresh for the index that gets committed.
> 
> I think it would be sane to do so.
> 
> IIUC this basically means that "git add <file> && git commit" should do 
> the same to the cache as "git commit <file>".

No, that's equivalent to "git commit -i <file>".  If you just say "git
commit <file>", that will create a temporary index initialized to HEAD,
add file to that index and the regular (user) index, and then commit the
temporary index file.  The shell script doesn't refresh the regular
index in this case.  I think it makes sense to add that, but it will be
a subtle difference in behaviour.

cheers,
Kristian

  reply	other threads:[~2007-11-09 17:45 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-09 16:40 [PATCH] builtin-commit: Refresh cache after adding files Kristian Høgsberg
2007-11-09 17:05 ` Johannes Schindelin
2007-11-09 17:13   ` Kristian Høgsberg
2007-11-09 17:24     ` Johannes Schindelin
2007-11-09 17:38       ` Kristian Høgsberg [this message]
2007-11-09 18:24   ` Junio C Hamano
2007-11-09 18:39     ` Kristian Høgsberg
2007-11-10  1:40     ` *[PATCH] " Junio C Hamano
2007-11-10  2:02       ` Johannes Schindelin
2007-11-10  2:26         ` Junio C Hamano
2007-11-10  2:22     ` [PATCH] git-add: make the entry stat-clean after re-adding the same contents Junio C Hamano
2007-11-10  2:43       ` Linus Torvalds
2007-11-10  9:01         ` [PATCH 1/2] ce_match_stat, run_diff_files: use symbolic constants for readability Junio C Hamano
2007-11-10  9:02         ` [PATCH 2/2] git-add: make the entry stat-clean after re-adding the same contents Junio C Hamano

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=1194629893.30909.12.camel@hinata.boston.redhat.com \
    --to=krh@redhat.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).