Re: RFH: refactor read-tree

From: Alex Riesen <fork0@t-online.de>
Date: Jul 9, 2006, 22:17 UTC
Message-ID: <20060709221753.GB6966@steel.home>
In-Reply-To: <Pine.LNX.4.64.0607090827430.5623@g5.osdl.org>

Linus Torvalds, Sun, Jul 09, 2006 17:30:26 +0200:

Show 14 quoted lines

> > > > The basic idea is that "branch1" should be your current branch, and it 
> > > > obviously is also expected to match (more or less) the current index. So 
> > > > you can do a merge by
> > > > 
> > > >  - reading in "branch1" into the index:
> > > > 
> > > > 	GIT_INDEX_FILE=.git/tmp-index git-read-tree -m branch1
> > > 
> > > what is "-m" here for?
> > 
> > It means that git-read-tree tries to merge the current index with branch1.
> 
> Well, the current index always "merges" by just taking the timestamps from 
> it. The actual _content_ doesn't matter for the single-tree case.

But the name suggests it's a temporary index, which would not have anything in it and even the .git/tmp-index is not supposed to exist. So I'd actually understand this as creating an index from the tree-ish branch1, without merging anything. And continue wondering what that -m is for...