From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 May 2017 04:05:03 +0000 (+0900)
Subject: Merge branch 'maint-2.7' into maint-2.8
X-Git-Tag: v2.8.5~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a8d93d19a2fede14a35db163a1fd3bc87b6ac41d?hp=-c

Merge branch 'maint-2.7' into maint-2.8
---

a8d93d19a2fede14a35db163a1fd3bc87b6ac41d
diff --combined Documentation/git.txt
index 5a10e9b4a0,bf9b6c8c87..2cfad870fc
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,26 -43,20 +43,29 @@@ unreleased) version of Git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v2.8.4/git.html[documentation for release 2.8.4]
 +
 +* release notes for
 +  link:RelNotes/2.8.4.txt[2.8.4],
 +  link:RelNotes/2.8.3.txt[2.8.3],
 +  link:RelNotes/2.8.2.txt[2.8.2],
 +  link:RelNotes/2.8.1.txt[2.8.1],
 +  link:RelNotes/2.8.0.txt[2.8].
 +
- * link:v2.7.3/git.html[documentation for release 2.7.3]
+ * link:v2.7.5/git.html[documentation for release 2.7.5]
  
  * release notes for
+   link:RelNotes/2.7.5.txt[2.7.5],
+   link:RelNotes/2.7.4.txt[2.7.4],
    link:RelNotes/2.7.3.txt[2.7.3],
    link:RelNotes/2.7.2.txt[2.7.2],
    link:RelNotes/2.7.1.txt[2.7.1],
    link:RelNotes/2.7.0.txt[2.7].
  
- * link:v2.6.6/git.html[documentation for release 2.6.6]
+ * link:v2.6.7/git.html[documentation for release 2.6.7]
  
  * release notes for
+   link:RelNotes/2.6.7.txt[2.6.7],
    link:RelNotes/2.6.6.txt[2.6.6],
    link:RelNotes/2.6.5.txt[2.6.5],
    link:RelNotes/2.6.4.txt[2.6.4],
@@@ -71,9 -65,10 +74,10 @@@
    link:RelNotes/2.6.1.txt[2.6.1],
    link:RelNotes/2.6.0.txt[2.6].
  
- * link:v2.5.5/git.html[documentation for release 2.5.5]
+ * link:v2.5.6/git.html[documentation for release 2.5.6]
  
  * release notes for
+   link:RelNotes/2.5.6.txt[2.5.6],
    link:RelNotes/2.5.5.txt[2.5.5],
    link:RelNotes/2.5.4.txt[2.5.4],
    link:RelNotes/2.5.3.txt[2.5.3],
@@@ -81,9 -76,10 +85,10 @@@
    link:RelNotes/2.5.1.txt[2.5.1],
    link:RelNotes/2.5.0.txt[2.5].
  
- * link:v2.4.11/git.html[documentation for release 2.4.11]
+ * link:v2.4.12/git.html[documentation for release 2.4.12]
  
  * release notes for
+   link:RelNotes/2.4.12.txt[2.4.12],
    link:RelNotes/2.4.11.txt[2.4.11],
    link:RelNotes/2.4.10.txt[2.4.10],
    link:RelNotes/2.4.9.txt[2.4.9],
@@@ -1136,7 -1132,9 +1141,7 @@@ of clones and fetches
  	    connection (or proxy, if configured)
  
  	  - `ssh`: git over ssh (including `host:path` syntax,
 -	    `git+ssh://`, etc).
 -
 -	  - `rsync`: git over rsync
 +	    `ssh://`, etc).
  
  	  - `http`: git over http, both "smart http" and "dumb http".
  	    Note that this does _not_ include `https`; if you want both,
diff --combined shell.c
index c5439a63e9,c3bf8ec38a..2af80c68bf
--- a/shell.c
+++ b/shell.c
@@@ -13,7 -13,7 +13,7 @@@ static int do_generic_cmd(const char *m
  	const char *my_argv[4];
  
  	setup_path();
- 	if (!arg || !(arg = sq_dequote(arg)))
+ 	if (!arg || !(arg = sq_dequote(arg)) || *arg == '-')
  		die("bad argument");
  	if (!starts_with(me, "git-"))
  		die("bad command");
@@@ -88,7 -88,7 +88,7 @@@ static void run_shell(void
  		int count;
  
  		fprintf(stderr, "git> ");
 -		if (strbuf_getline(&line, stdin, '\n') == EOF) {
 +		if (strbuf_getline_lf(&line, stdin) == EOF) {
  			fprintf(stderr, "\n");
  			strbuf_release(&line);
  			break;