From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2011 23:13:31 +0000 (-0700)
Subject: Merge branch 'cn/eradicate-working-copy' into maint
X-Git-Tag: v1.7.8-rc0~7^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a5ad8d1bddecfcbe318e5e409e6e9e40c7c073d3?ds=inline;hp=-c

Merge branch 'cn/eradicate-working-copy' into maint

* cn/eradicate-working-copy:
Remove 'working copy' from the documentation and C code
---

a5ad8d1bddecfcbe318e5e409e6e9e40c7c073d3
diff --combined Documentation/config.txt
index 0781341d6b,c489b3bc15..eae75a39c0
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -147,7 -147,7 +147,7 @@@ advice.*:
  
  core.fileMode::
  	If false, the executable bit differences between the index and
- 	the working copy are ignored; useful on broken filesystems like FAT.
+ 	the working tree are ignored; useful on broken filesystems like FAT.
  	See linkgit:git-update-index[1].
  +
  The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
@@@ -179,7 -179,7 +179,7 @@@ is created
  
  core.trustctime::
  	If false, the ctime differences between the index and the
- 	working copy are ignored; useful when the inode change time
+ 	working tree are ignored; useful when the inode change time
  	is regularly modified by something outside Git (file system
  	crawlers and some backup systems).
  	See linkgit:git-update-index[1]. True by default.
@@@ -292,7 -292,7 +292,7 @@@ core.ignoreStat:
  	If true, commands which modify both the working tree and the index
  	will mark the updated paths with the "assume unchanged" bit in the
  	index. These marked files are then assumed to stay unchanged in the
- 	working copy, until you	mark them otherwise manually - Git will not
+ 	working tree, until you mark them otherwise manually - Git will not
  	detect the file changes	by lstat() calls. This is useful on systems
  	where those are very slow, such as Microsoft Windows.
  	See linkgit:git-update-index[1].
@@@ -1453,8 -1453,7 +1453,8 @@@ notes.rewriteRef:
  	You may also specify this configuration several times.
  +
  Does not have a default value; you must configure this variable to
 -enable note rewriting.
 +enable note rewriting.  Set it to `refs/notes/commits` to enable
 +rewriting for the default commit notes.
  +
  This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
  environment variable, which must be a colon separated list of refs or
diff --combined diff-lib.c
index ebe751e72d,c5e07545b2..62f4cd94cf
--- a/diff-lib.c
+++ b/diff-lib.c
@@@ -289,7 -289,7 +289,7 @@@ static void show_new_file(struct rev_in
  
  	/*
  	 * New file in the index: it might actually be different in
- 	 * the working copy.
+ 	 * the working tree.
  	 */
  	if (get_stat_data(new, &sha1, &mode, cached, match_missing,
  	    &dirty_submodule, &revs->diffopt) < 0)
@@@ -468,7 -468,6 +468,7 @@@ static int diff_cache(struct rev_info *
  	opts.unpack_data = revs;
  	opts.src_index = &the_index;
  	opts.dst_index = NULL;
 +	opts.pathspec = &revs->diffopt.pathspec;
  
  	init_tree_desc(&t, tree->buffer, tree->size);
  	return unpack_trees(1, &t, &opts);
diff --combined merge-recursive.c
index 3efc04e04f,8148a4fab3..c34a4f148b
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@@ -390,7 -390,7 +390,7 @@@ static void record_df_conflict_files(st
  				     struct string_list *entries)
  {
  	/* If there is a D/F conflict and the file for such a conflict
- 	 * currently exist in the working copy, we want to allow it to be
+ 	 * currently exist in the working tree, we want to allow it to be
  	 * removed to make room for the corresponding directory if needed.
  	 * The files underneath the directories of such D/F conflicts will
  	 * be processed before the corresponding file involved in the D/F
@@@ -1627,7 -1627,7 +1627,7 @@@ static int merge_content(struct merge_o
  		path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
  		if (!path_renamed_outside_HEAD) {
  			add_cacheinfo(mfi.mode, mfi.sha, path,
 -				      0 /*stage*/, 1 /*refresh*/, 0 /*options*/);
 +				      0, (!o->call_depth), 0);
  			return mfi.clean;
  		}
  	} else