git, branch v2.1.3

Git 2.1.3

2014-10-29T17:48:45Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/pack-objects-no-bitmap-when-splitting' into maint

2014-10-29T17:35:17Z

* jk/pack-objects-no-bitmap-when-splitting: pack-objects: turn off bitmaps when we split packs

Merge branch 'da/mergetool-meld' into maint

2014-10-29T17:35:16Z

* da/mergetool-meld: mergetools/meld: make usage of `--output` configurable and more robust

Merge branch 'rm/gitweb-start-form' into maint

2014-10-29T17:35:16Z

* rm/gitweb-start-form: gitweb: use start_form, not startform that was removed in CGI.pm 4.04

Merge branch 'bc/asciidoc-pretty-formats-fix' into maint

2014-10-29T17:35:10Z

* bc/asciidoc-pretty-formats-fix: Documentation: fix misrender of pretty-formats in Asciidoctor

Merge branch 'rs/daemon-fixes' into maint

2014-10-29T17:35:09Z

* rs/daemon-fixes: daemon: remove write-only variable maxfd daemon: fix error message after bind() daemon: handle gethostbyname() error

pack-objects: turn off bitmaps when we split packs

2014-10-19T22:08:38Z

If a pack.packSizeLimit is set, we may split the pack data across multiple packfiles. This means we cannot generate .bitmap files, as they require that all of the reachable objects are in the same pack. We check that condition when we are generating the list of objects to pack (and disable bitmaps if we are not packing everything), but we forgot to update it when we notice that we needed to split (which doesn't happen until the actual write phase). The resulting bitmaps are quite bogus (they mention entries that do not exist in the pack!) and can cause a fetch or push to send insufficient objects. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

gitweb: use start_form, not startform that was removed in CGI.pm 4.04

2014-10-16T20:12:34Z

CGI.pm 4.04 removed the startform method, which had previously been deprecated in favour of start_form. Changes file for CGI.pm says: 4.04 2014-09-04 [ REMOVED / DEPRECATIONS ] - startform and endform methods removed (previously deprecated, you should be using the start_form and end_form methods) Signed-off-by: Roland Mas Reviewed-by: Jakub Narębski Signed-off-by: Junio C Hamano

mergetools/meld: make usage of `--output` configurable and more robust

2014-10-16T18:58:11Z

Older versions of meld listed --output in `meld --help`. Newer versions only mention `meld [OPTIONS...]`. Improve the checks to catch these newer versions. Add a `mergetool.meld.hasOutput` configuration to allow overriding the heuristic. Reported-by: Andrey Novoseltsev Helped-by: Junio C Hamano Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Documentation: fix misrender of pretty-formats in Asciidoctor

2014-10-08T20:51:46Z

Neither the AsciiDoc nor the Asciidoctor documentation specify whether the same number of delimiter characters must be used to end a block as to begin it, although both sets of documentation show exactly matching pairs. AsciiDoc allows mismatches, but AsciiDoctor apparently does not. Adjust the pretty formats documentation to use matching pairs to prevent a misrendering where the remainder of the document was rendered as a listing block. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano