git, branch v2.6.7

Git 2.6.7

2017-05-05T03:56:19Z

Signed-off-by: Junio C Hamano

Merge branch 'maint-2.5' into maint-2.6

2017-05-05T03:52:26Z

Git 2.5.6

2017-05-05T03:50:38Z

Signed-off-by: Junio C Hamano

Merge branch 'maint-2.4' into maint-2.5

2017-05-05T03:46:53Z

Git 2.4.12

2017-05-05T03:43:16Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/shell-no-repository-that-begins-with-dash' into maint-2.4

2017-05-05T03:17:55Z

* jk/shell-no-repository-that-begins-with-dash: shell: disallow repo names beginning with dash

shell: disallow repo names beginning with dash

2017-05-05T03:07:27Z

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 Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Git 2.6.6

2016-03-17T18:26:41Z

Signed-off-by: Junio C Hamano

Merge branch 'maint-2.5' into maint-2.6

2016-03-17T18:26:18Z

* maint-2.5: Git 2.5.5 Git 2.4.11 list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow

Git 2.5.5

2016-03-17T18:24:59Z

Signed-off-by: Junio C Hamano