Skip to content

Commit a8d93d1

Browse files
committed
Merge branch 'maint-2.7' into maint-2.8
2 parents 0b65a8d + c8dd1e3 commit a8d93d1

File tree

6 files changed

+60
-5
lines changed

6 files changed

+60
-5
lines changed

Documentation/RelNotes/2.4.12.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Git v2.4.12 Release Notes
2+
=========================
3+
4+
Fixes since v2.4.11
5+
-------------------
6+
7+
* "git-shell" rejects a request to serve a repository whose name
8+
begins with a dash, which makes it no longer possible to get it
9+
confused into spawning service programs like "git-upload-pack" with
10+
an option like "--help", which in turn would spawn an interactive
11+
pager, instead of working with the repository user asked to access
12+
(i.e. the one whose name is "--help").

Documentation/RelNotes/2.5.6.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Git v2.5.6 Release Notes
2+
========================
3+
4+
Fixes since v2.5.5
5+
------------------
6+
7+
* "git-shell" rejects a request to serve a repository whose name
8+
begins with a dash, which makes it no longer possible to get it
9+
confused into spawning service programs like "git-upload-pack" with
10+
an option like "--help", which in turn would spawn an interactive
11+
pager, instead of working with the repository user asked to access
12+
(i.e. the one whose name is "--help").

Documentation/RelNotes/2.6.7.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Git v2.6.7 Release Notes
2+
========================
3+
4+
Fixes since v2.6.6
5+
------------------
6+
7+
* "git-shell" rejects a request to serve a repository whose name
8+
begins with a dash, which makes it no longer possible to get it
9+
confused into spawning service programs like "git-upload-pack" with
10+
an option like "--help", which in turn would spawn an interactive
11+
pager, instead of working with the repository user asked to access
12+
(i.e. the one whose name is "--help").

Documentation/RelNotes/2.7.5.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Git v2.7.5 Release Notes
2+
========================
3+
4+
Fixes since v2.7.4
5+
------------------
6+
7+
* "git-shell" rejects a request to serve a repository whose name
8+
begins with a dash, which makes it no longer possible to get it
9+
confused into spawning service programs like "git-upload-pack" with
10+
an option like "--help", which in turn would spawn an interactive
11+
pager, instead of working with the repository user asked to access
12+
(i.e. the one whose name is "--help").
13+
14+
Also contains a few fixes backported from later development tracks.

Documentation/git.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,20 @@ Documentation for older releases are available here:
5252
link:RelNotes/2.8.1.txt[2.8.1],
5353
link:RelNotes/2.8.0.txt[2.8].
5454

55-
* link:v2.7.3/git.html[documentation for release 2.7.3]
55+
* link:v2.7.5/git.html[documentation for release 2.7.5]
5656

5757
* release notes for
58+
link:RelNotes/2.7.5.txt[2.7.5],
59+
link:RelNotes/2.7.4.txt[2.7.4],
5860
link:RelNotes/2.7.3.txt[2.7.3],
5961
link:RelNotes/2.7.2.txt[2.7.2],
6062
link:RelNotes/2.7.1.txt[2.7.1],
6163
link:RelNotes/2.7.0.txt[2.7].
6264

63-
* link:v2.6.6/git.html[documentation for release 2.6.6]
65+
* link:v2.6.7/git.html[documentation for release 2.6.7]
6466

6567
* release notes for
68+
link:RelNotes/2.6.7.txt[2.6.7],
6669
link:RelNotes/2.6.6.txt[2.6.6],
6770
link:RelNotes/2.6.5.txt[2.6.5],
6871
link:RelNotes/2.6.4.txt[2.6.4],
@@ -71,19 +74,21 @@ Documentation for older releases are available here:
7174
link:RelNotes/2.6.1.txt[2.6.1],
7275
link:RelNotes/2.6.0.txt[2.6].
7376

74-
* link:v2.5.5/git.html[documentation for release 2.5.5]
77+
* link:v2.5.6/git.html[documentation for release 2.5.6]
7578

7679
* release notes for
80+
link:RelNotes/2.5.6.txt[2.5.6],
7781
link:RelNotes/2.5.5.txt[2.5.5],
7882
link:RelNotes/2.5.4.txt[2.5.4],
7983
link:RelNotes/2.5.3.txt[2.5.3],
8084
link:RelNotes/2.5.2.txt[2.5.2],
8185
link:RelNotes/2.5.1.txt[2.5.1],
8286
link:RelNotes/2.5.0.txt[2.5].
8387

84-
* link:v2.4.11/git.html[documentation for release 2.4.11]
88+
* link:v2.4.12/git.html[documentation for release 2.4.12]
8589

8690
* release notes for
91+
link:RelNotes/2.4.12.txt[2.4.12],
8792
link:RelNotes/2.4.11.txt[2.4.11],
8893
link:RelNotes/2.4.10.txt[2.4.10],
8994
link:RelNotes/2.4.9.txt[2.4.9],

shell.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ static int do_generic_cmd(const char *me, char *arg)
1313
const char *my_argv[4];
1414

1515
setup_path();
16-
if (!arg || !(arg = sq_dequote(arg)))
16+
if (!arg || !(arg = sq_dequote(arg)) || *arg == '-')
1717
die("bad argument");
1818
if (!starts_with(me, "git-"))
1919
die("bad command");

0 commit comments

Comments
 (0)