Replace the last 'dircache's by 'index'

jnareb · Junio C Hamano · commit 5adf317b3172 · 2007-05-25T20:54:23.000-07:00
Signed-off-by: Jakub Narebski &lt;jnareb@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
@@ -124,7 +124,7 @@ which case it outputs:
 detailed information on unmerged paths.
 
 For an unmerged path, instead of recording a single mode/SHA1 pair,
-the dircache records up to three such pairs; one from tree O in stage
+the index records up to three such pairs; one from tree O in stage
 1, A in stage 2, and B in stage 3.  This information can be used by
 the user (or the porcelain) to see what should eventually be recorded at the
 path. (see git-read-tree for more information on state)
diff --git a/diff.c b/diff.c
@@ -1258,7 +1258,7 @@ void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
 }
 
 /*
- * Given a name and sha1 pair, if the dircache tells us the file in
+ * Given a name and sha1 pair, if the index tells us the file in
  * the work tree has that object contents, return true, so that
  * prepare_temp_file() does not have to inflate and extract.
  */

Original file line number	Diff line number	Diff line change
`@@ -1258,7 +1258,7 @@ void fill_filespec(struct diff_filespec spec, const unsigned char sha1,`
`1258`	`1258`	`}`
`1259`	`1259`
`1260`	`1260`	`/*`
`1261`		`- * Given a name and sha1 pair, if the dircache tells us the file in`
	`1261`	`+ * Given a name and sha1 pair, if the index tells us the file in`
`1262`	`1262`	`* the work tree has that object contents, return true, so that`
`1263`	`1263`	`* prepare_temp_file() does not have to inflate and extract.`
`1264`	`1264`	`*/`