From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Apr 2012 17:22:20 +0000 (-0700)
Subject: Sync with 1.7.8.6
X-Git-Tag: v1.7.9.7~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b2bab5b338b30d45e338c8df3c15e6483d6bb11e?ds=inline;hp=-c

Sync with 1.7.8.6
---

b2bab5b338b30d45e338c8df3c15e6483d6bb11e
diff --combined Documentation/git.txt
index ae34e8a7f6,16528492df..f28a176738
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -9,11 -9,11 +9,11 @@@ git - the stupid content tracke
  SYNOPSIS
  --------
  [verse]
 -'git' [--version] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
 +'git' [--version] [--help] [-c <name>=<value>]
 +    [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
      [-p|--paginate|--no-pager] [--no-replace-objects] [--bare]
      [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
 -    [-c <name>=<value>]
 -    [--help] <command> [<args>]
 +    <command> [<args>]
  
  DESCRIPTION
  -----------
@@@ -44,20 -44,10 +44,21 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v1.7.9.6/git.html[documentation for release 1.7.9.6]
 +
 +* release notes for
 +  link:RelNotes/1.7.9.6.txt[1.7.9.6],
 +  link:RelNotes/1.7.9.5.txt[1.7.9.5],
 +  link:RelNotes/1.7.9.4.txt[1.7.9.4],
 +  link:RelNotes/1.7.9.3.txt[1.7.9.3],
 +  link:RelNotes/1.7.9.2.txt[1.7.9.2],
 +  link:RelNotes/1.7.9.1.txt[1.7.9.1],
 +  link:RelNotes/1.7.9.txt[1.7.9].
 +
- * link:v1.7.8.5/git.html[documentation for release 1.7.8.5]
+ * link:v1.7.8.6/git.html[documentation for release 1.7.8.6]
  
  * release notes for
+   link:RelNotes/1.7.8.6.txt[1.7.8.6],
    link:RelNotes/1.7.8.5.txt[1.7.8.5],
    link:RelNotes/1.7.8.4.txt[1.7.8.4],
    link:RelNotes/1.7.8.3.txt[1.7.8.3],
@@@ -65,9 -55,10 +66,10 @@@
    link:RelNotes/1.7.8.1.txt[1.7.8.1],
    link:RelNotes/1.7.8.txt[1.7.8].
  
- * link:v1.7.7.6/git.html[documentation for release 1.7.7.6]
+ * link:v1.7.7.7/git.html[documentation for release 1.7.7.7]
  
  * release notes for
+   link:RelNotes/1.7.7.7.txt[1.7.7.7],
    link:RelNotes/1.7.7.6.txt[1.7.7.6],
    link:RelNotes/1.7.7.5.txt[1.7.7.5],
    link:RelNotes/1.7.7.4.txt[1.7.7.4],
@@@ -714,12 -705,6 +716,12 @@@ othe
  	a pager.  See also the `core.pager` option in
  	linkgit:git-config[1].
  
 +'GIT_EDITOR'::
 +	This environment variable overrides `$EDITOR` and `$VISUAL`.
 +	It is used by several git comands when, on interactive mode,
 +	an editor is to be launched. See also linkgit:git-var[1]
 +	and the `core.editor` option in linkgit:git-config[1].
 +
  'GIT_SSH'::
  	If this environment variable is set then 'git fetch'
  	and 'git push' will use this command instead
diff --combined bundle.c
index d9cfd90534,0d22f23dd7..27ab32e431
--- a/bundle.c
+++ b/bundle.c
@@@ -289,7 -289,7 +289,7 @@@ int create_bundle(struct bundle_header 
  	argc = setup_revisions(argc, argv, &revs, NULL);
  
  	if (argc > 1)
- 		return error("unrecognized argument: %s'", argv[1]);
+ 		return error("unrecognized argument: %s", argv[1]);
  
  	object_array_remove_duplicates(&revs.pending);
  
@@@ -304,7 -304,7 +304,7 @@@
  			continue;
  		if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
  			continue;
 -		if (!resolve_ref(e->name, sha1, 1, &flag))
 +		if (read_ref_full(e->name, sha1, 1, &flag))
  			flag = 0;
  		display_ref = (flag & REF_ISSYMREF) ? e->name : ref;