mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-11 08:06:21 +02:00
Code

Merge branch 'maint-2.5' into maint-2.6

This commit is contained in:
Junio C Hamano 2017-05-05 12:52:26 +09:00
parent e46579643d ac33201285
commit ab37a18b60
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/RelNotes/2.4.12.txt Normal file
View File

@ -0,0 +1,12 @@
Git v2.4.12 Release Notes
=========================
Fixes since v2.4.11
-------------------
* "git-shell" rejects a request to serve a repository whose name
begins with a dash, which makes it no longer possible to get it
confused into spawning service programs like "git-upload-pack" with
an option like "--help", which in turn would spawn an interactive
pager, instead of working with the repository user asked to access
(i.e. the one whose name is "--help").

12
Documentation/RelNotes/2.5.6.txt Normal file
View File

@ -0,0 +1,12 @@
Git v2.5.6 Release Notes
========================
Fixes since v2.5.5
------------------
* "git-shell" rejects a request to serve a repository whose name
begins with a dash, which makes it no longer possible to get it
confused into spawning service programs like "git-upload-pack" with
an option like "--help", which in turn would spawn an interactive
pager, instead of working with the repository user asked to access
(i.e. the one whose name is "--help").

6
Documentation/git.txt
View File

@ -54,9 +54,10 @@ Documentation for older releases are available here:
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],
@ -64,9 +65,10 @@ Documentation for older releases are available here:
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],

2
shell.c
View File

@ -13,7 +13,7 @@ static int do_generic_cmd(const char *me, char *arg)
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");