delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	docs/config: consistify include.path examplesjk/doc-config-include	Jeff King	2017-05-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Most of the include examples use "foo.inc", but some use "foo". Since the string of examples are meant to show variations and how they differ, it's a good idea to change only one thing at a time. The filename differences are not relevant to what we're trying to show. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	docs/config: avoid the term "expand" for includes	Jeff King	2017-05-12	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the word "expand" to refer to including the contents of another config file isn't really accurate, since it's a verbatim insertion. And it can cause confusion with the expanding of the path itself via things like "~". Let's clarify when we are referring to the contents versus the filename, and use appropriate verbs in each case. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	docs/config: give a relative includeIf example	Jeff King	2017-05-12	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	The changes in the previous commit hopefully clarify that the evaluation of an include "path" variable is the same no matter if it's in a conditional section or not. But since this question came up on the list, let's add an example that makes it obvious. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	docs/config: clarify include/includeIf relationship	Jeff King	2017-05-12	1	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \|	The "includeIf" directives behave exactly like include ones, except they only kick in when the conditional is true. That was mentioned in the "conditional" section, but let's make it more clear for the whole "includes" section, since people don't necessarily read the documentation top to bottom. Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Git 2.13v2.13.0	Junio C Hamano	2017-05-09	3	-1/+14
\| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Merge tag 'l10n-2.13.0-rnd2.1' of git://github.com/git-l10n/git-po	Junio C Hamano	2017-05-09	9	-19174/+23732
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	l10n for Git 2.13.0 round 2.1 * tag 'l10n-2.13.0-rnd2.1' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.13.0 l10n round 2 l10n: sv.po: Update Swedish translation (3195t0f0u) l10n: zh_CN: review for git v2.13.0 l10n round 1 l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (3195t) l10n: fr.po v2.13 rnd 2 l10n: de.po: translate 4 new messages l10n: de.po: update German translation l10n: de.po: lower case after semi-colon l10n: vi.po(3195t): Update translation for v2.13.0 round 2 l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed) l10n: zh_CN: for git v2.13.0 l10n round 1 l10n: fr.po v2.13 round 1 l10n: pt_PT: update Portuguese translation l10n: bg.po: Updated Bulgarian translation (3201t) l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0 l10n: sv.po: Update Swedish translation (3199t0f0u) l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)
\| *	Merge branch 'master' of git://github.com/nafmo/git-l10n-sv	Jiang Xin	2017-05-09	1	-434/+439
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (3195t0f0u)
\| \| *	l10n: sv.po: Update Swedish translation (3195t0f0u)	Peter Krefting	2017-05-09	1	-434/+439
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
\| * \|	l10n: zh_CN: for git v2.13.0 l10n round 2	Jiang Xin	2017-05-09	1	-429/+436
\| \|/ \| \| \| \| \| \| \| \| \| \|	Translate 4 messages (3195t0f0u) for git v2.13.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
\| *	l10n: zh_CN: review for git v2.13.0 l10n round 1	Ray Chen	2017-05-09	1	-17/+17
\| \| \| \| \| \| \| \|	Signed-off-by: Ray Chen <oldsharp@gmail.com>
\| *	Merge branch 'master' of https://github.com/vnwildman/git	Jiang Xin	2017-05-09	1	-431/+438
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of https://github.com/vnwildman/git: l10n: vi.po(3195t): Update translation for v2.13.0 round 2
\| \| *	l10n: vi.po(3195t): Update translation for v2.13.0 round 2	Tran Ngoc Quan	2017-05-05	1	-431/+438
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
\| * \|	l10n: Update Catalan translation	Jordi Mas	2017-05-09	1	-2126/+2491
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jordi Mas <jmas@softcatala.org>
\| * \|	l10n: bg.po: Updated Bulgarian translation (3195t)	Alexander Shopov	2017-05-09	1	-85/+61
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Alexander Shopov <ash@kambanaria.org>
\| * \|	Merge branch 'fr_l10n_v2.13_rnd2' of git://github.com/jnavila/git	Jiang Xin	2017-05-09	1	-448/+478
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'fr_l10n_v2.13_rnd2' of git://github.com/jnavila/git: l10n: fr.po v2.13 rnd 2
\| \| * \|	l10n: fr.po v2.13 rnd 2	Jean-Noel Avila	2017-05-06	1	-448/+478
\| \| \|/ \| \| \| \| \| \| \| \| \|	Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
\| * \|	l10n: de.po: translate 4 new messages	Ralf Thielow	2017-05-05	1	-440/+465
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Translate 4 new messages came from git.pot update in 28e1aaa48 (l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
\| * \|	l10n: de.po: update German translation	Ralf Thielow	2017-05-05	1	-1989/+2381
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Translate 96 new messages came from git.pot update in dfc182b (l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
\| * \|	l10n: de.po: lower case after semi-colon	Michael J Gruber	2017-05-05	1	-1/+1
\| \|/ \| \| \| \| \| \| \| \|	Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
\| *	l10n: git.pot: v2.13.0 round 2 (4 new, 7 removed)	Jiang Xin	2017-05-05	1	-428/+417
\| \| \| \| \| \| \| \| \| \| \| \|	Generate po/git.pot from v2.13.0-rc2 for git v2.13.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
\| *	Merge branch 'master' of git://github.com/git-l10n/git-po	Jiang Xin	2017-05-05	7	-14167/+17929
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.13.0 l10n round 1 l10n: fr.po v2.13 round 1 l10n: pt_PT: update Portuguese translation l10n: bg.po: Updated Bulgarian translation (3201t) l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0 l10n: sv.po: Update Swedish translation (3199t0f0u) l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)
\| \| *	l10n: zh_CN: for git v2.13.0 l10n round 1	Jiang Xin	2017-05-05	1	-1947/+2303
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Translate 96 messages (3198t0f0u) for git v2.13.0-rc0. Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
\| \| *	Merge branch 'fr_l10n_v2.13_rnd1' of git://github.com/jnavila/git	Jiang Xin	2017-05-05	1	-1943/+2285
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'fr_l10n_v2.13_rnd1' of git://github.com/jnavila/git: l10n: fr.po v2.13 round 1
\| \| \| *	l10n: fr.po v2.13 round 1	Jean-Noel Avila	2017-05-02	1	-1943/+2285
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
\| \| * \|	l10n: pt_PT: update Portuguese translation	Vasco Almeida	2017-05-01	1	-2057/+2471
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
\| \| * \|	l10n: bg.po: Updated Bulgarian translation (3201t)	Alexander Shopov	2017-04-30	1	-2423/+4086
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Alexander Shopov <ash@kambanaria.org>
\| \| * \|	Merge branch 'master' of https://github.com/vnwildman/git	Jiang Xin	2017-04-29	1	-1946/+2299
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 'master' of https://github.com/vnwildman/git: l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0
\| \| \| * \|	l10n: vi.po(3198t): Updated Vietnamese translation for v2.13.0-rc0	Tran Ngoc Quan	2017-04-25	1	-1946/+2299
\| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
\| \| * \|	l10n: sv.po: Update Swedish translation (3199t0f0u)	Peter Krefting	2017-04-23	1	-1938/+2294
\| \| \|/ \| \| \| \| \| \| \| \| \|	Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
\| \| *	l10n: git.pot: v2.13.0 round 1 (96 new, 37 removed)	Jiang Xin	2017-04-23	1	-1913/+2191
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Generate po/git.pot from v2.13.0-rc0 for git v2.13.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* \| \|	Sync with v2.12.3	Junio C Hamano	2017-05-08	11	-11/+116
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
\| * \| \|	Git 2.12.3v2.12.3	Junio C Hamano	2017-05-05	3	-4/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
\| * \| \|	Merge branch 'maint-2.11' into maint	Junio C Hamano	2017-05-05	10	-8/+105
\| \|\ \ \
\| \| * \| \|	Git 2.11.2v2.11.2	Junio C Hamano	2017-05-05	4	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
\| \| * \| \|	Merge branch 'maint-2.10' into maint-2.11	Junio C Hamano	2017-05-05	9	-8/+92
\| \| \|\ \ \
\| \| \| * \| \|	Git 2.10.3v2.10.3	Junio C Hamano	2017-05-05	3	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
\| \| \| * \| \|	Merge branch 'maint-2.9' into maint-2.10	Junio C Hamano	2017-05-05	8	-7/+83
\| \| \| \|\ \ \
\| \| \| \| * \| \|	Git 2.9.4v2.9.4	Junio C Hamano	2017-05-05	3	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
\| \| \| \| * \| \|	Merge branch 'maint-2.8' into maint-2.9	Junio C Hamano	2017-05-05	7	-6/+74
\| \| \| \| \|\ \ \
\| \| \| \| \| * \| \|	Git 2.8.5v2.8.5	Junio C Hamano	2017-05-05	4	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
\| \| \| \| \| * \| \|	Merge branch 'maint-2.7' into maint-2.8	Junio C Hamano	2017-05-05	6	-5/+60
\| \| \| \| \| \|\ \ \
\| \| \| \| \| \| * \| \|	Git 2.7.5v2.7.5	Junio C Hamano	2017-05-05	4	-3/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
\| \| \| \| \| \| * \| \|	Merge branch 'maint-2.6' into maint-2.7	Junio C Hamano	2017-05-05	5	-4/+43
\| \| \| \| \| \| \|\ \ \
\| \| \| \| \| \| \| * \| \|	Git 2.6.7v2.6.7 maint-2.6	Junio C Hamano	2017-05-05	4	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
\| \| \| \| \| \| \| * \| \|	Merge branch 'maint-2.5' into maint-2.6	Junio C Hamano	2017-05-05	4	-3/+29
\| \| \| \| \| \| \| \|\ \ \
\| \| \| \| \| \| \| \| * \| \|	Git 2.5.6v2.5.6 maint-2.5	Junio C Hamano	2017-05-05	4	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
\| \| \| \| \| \| \| \| * \| \|	Merge branch 'maint-2.4' into maint-2.5	Junio C Hamano	2017-05-05	3	-2/+15
\| \| \| \| \| \| \| \| \|\ \ \
\| \| \| \| \| \| \| \| \| * \| \|	Git 2.4.12v2.4.12 maint-2.4	Junio C Hamano	2017-05-05	4	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Junio C Hamano <gitster@pobox.com>
\| \| \| \| \| \| \| \| \| * \| \|	Merge branch 'jk/shell-no-repository-that-begins-with-dash' into maint-2.4	Junio C Hamano	2017-05-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* jk/shell-no-repository-that-begins-with-dash: shell: disallow repo names beginning with dash
\| \| \| \| \| \| \| \| \| \| * \| \|	shell: disallow repo names beginning with dashjk/shell-no-repository-that-begins-with-dash	Jeff King	2017-05-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a remote server uses git-shell, the client side will connect to it like: ssh server "git-upload-pack 'foo.git'" and we literally exec ("git-upload-pack", "foo.git"). In early versions of upload-pack and receive-pack, we took a repository argument and nothing else. But over time they learned to accept dashed options. If the user passes a repository name that starts with a dash, the results are confusing at best (we complain of a bogus option instead of a non-existent repository) and malicious at worst (the user can start an interactive pager via "--help"). We could pass "--" to the sub-process to make sure the user's argument is interpreted as a branch name. I.e.: git-upload-pack -- -foo.git But adding "--" automatically would make us inconsistent with a normal shell (i.e., when git-shell is not in use), where "-foo.git" would still be an error. For that case, the client would have to specify the "--", but they can't do so reliably, as existing versions of git-shell do not allow more than a single argument. The simplest thing is to simply disallow "-" at the start of the repo name argument. This hasn't worked either with or without git-shell since version 1.0.0, and nobody has complained. Note that this patch just applies to do_generic_cmd(), which runs upload-pack, receive-pack, and upload-archive. There are two other types of commands that git-shell runs: - do_cvs_cmd(), but this already restricts the argument to be the literal string "server" - admin-provided commands in the git-shell-commands directory. We'll pass along arbitrary arguments there, so these commands could have similar problems. But these commands might actually understand dashed arguments, so we cannot just block them here. It's up to the writer of the commands to make sure they are safe. With great power comes great responsibility. Reported-by: Timo Schmid <tschmid@ernw.de> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>