git, branch v2.5.2

Git 2.5.2

2015-09-04T17:46:07Z

Signed-off-by: Junio C Hamano

Sync with 2.4.9

2015-09-04T17:43:23Z

Git 2.4.9

2015-09-04T17:36:14Z

Signed-off-by: Junio C Hamano

Sync with 2.3.9

2015-09-04T17:34:19Z

Git 2.3.9

2015-09-04T17:32:15Z

Signed-off-by: Junio C Hamano

Sync with 2.2.3

2015-09-04T17:29:28Z

Git 2.2.3

2015-09-04T17:26:23Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/long-paths' into maint-2.2

2015-09-04T17:25:23Z

show-branch: use a strbuf for reflog descriptions

2015-09-04T16:48:26Z

When we show "branch@{0}", we format into a fixed-size buffer using sprintf. This can overflow if you have long branch names. We can fix it by using a temporary strbuf. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

read_info_alternates: handle paths larger than PATH_MAX

2015-09-04T16:36:51Z

This function assumes that the relative_base path passed into it is no larger than PATH_MAX, and writes into a fixed-size buffer. However, this path may not have actually come from the filesystem; for example, add_submodule_odb generates a path using a strbuf and passes it in. This is hard to trigger in practice, though, because the long submodule directory would have to exist on disk before we would try to open its info/alternates file. We can easily avoid the bug, though, by simply creating the filename on the heap. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano