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

Merge branch 'maint-1.7.6' into maint

* maint-1.7.6:
make the sample pre-commit hook script reject names with newlines, too
git-read-tree.txt: update sparse checkout examples
git-read-tree.txt: correct sparse-checkout and skip-worktree description
git-read-tree.txt: language and typography fixes
unpack-trees: print "Aborting" to stderr
Documentation/git-update-index: refer to 'ls-files'
Documentation: basic configuration of notes.rewriteRef
---

411e6cf1971936ba31ffa142a6d5dc5c06dc8f7a
diff --combined Documentation/config.txt
index 0658ffb889,87643882fc..0781341d6b
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1198,14 -1198,6 +1198,14 @@@ http.proxy:
  	environment variable (see linkgit:curl[1]).  This can be overridden
  	on a per-remote basis; see remote.<name>.proxy
  
 +http.cookiefile::
 +	File containing previously stored cookie lines which should be used
 +	in the git http session, if they match the server. The file format
 +	of the file to read cookies from should be plain HTTP headers or
 +	the Netscape/Mozilla cookie file format (see linkgit:curl[1]).
 +	NOTE that the file specified with http.cookiefile is only used as
 +	input. No cookies will be stored in the file.
 +
  http.sslVerify::
  	Whether to verify the SSL certificate when fetching or pushing
  	over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment
@@@ -1453,7 -1445,8 +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 unpack-trees.c
index 670b464738,c3d3436add..237aed8c76
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@@ -159,7 -159,7 +159,7 @@@ static void display_error_msgs(struct u
  		string_list_clear(rejects, 0);
  	}
  	if (something_displayed)
- 		printf("Aborting\n");
+ 		fprintf(stderr, "Aborting\n");
  }
  
  /*
@@@ -444,7 -444,6 +444,7 @@@ static int traverse_trees_recursive(in
  
  	newinfo = *info;
  	newinfo.prev = info;
 +	newinfo.pathspec = info->pathspec;
  	newinfo.name = *p;
  	newinfo.pathlen += tree_entry_len(p->path, p->sha1) + 1;
  	newinfo.conflicts |= df_conflicts;
@@@ -1041,7 -1040,6 +1041,7 @@@ int unpack_trees(unsigned len, struct t
  		info.fn = unpack_callback;
  		info.data = o;
  		info.show_all_errors = o->show_all_errors;
 +		info.pathspec = o->pathspec;
  
  		if (o->prefix) {
  			/*