delta/git.git, branch sb/submodule-config-parse

submodule-config: "goto" removal in parse_config()

2015-10-12T19:28:33+00:00

Many components in if/else if/... cascade jumped to a shared
clean-up with "goto release_return", but we can restructure the
function a bit and make them disappear, which reduces the line count
as well.  Also reformat overlong lines and poorly indented ones
while at it.

The order of rules to verify the value for "ignore" used to be to
complain on multiple values first and then complain to boolean, but
swap the order to match how the values for "path" and "url" are
verified.

CC: Eric Sunshine 
CC: Heiko Voigt 
Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

Git 2.6.1

2015-09-29T02:19:34+00:00

Signed-off-by: Junio C Hamano

Sync with v2.5.4

2015-09-29T02:16:54+00:00

Git 2.5.4

2015-09-28T22:34:28+00:00

Signed-off-by: Junio C Hamano

Sync with 2.4.10

2015-09-28T22:33:56+00:00

Git 2.4.10

2015-09-28T22:30:30+00:00

Signed-off-by: Junio C Hamano

Sync with 2.3.10

2015-09-28T22:28:31+00:00

Git 2.3.10

2015-09-28T22:26:52+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jk/xdiff-memory-limits' into maint-2.3

2015-09-28T21:59:28+00:00

merge-file: enforce MAX_XDIFF_SIZE on incoming files

2015-09-28T21:58:13+00:00

The previous commit enforces MAX_XDIFF_SIZE at the
interfaces to xdiff: xdi_diff (which calls xdl_diff) and
ll_xdl_merge (which calls xdl_merge).

But we have another direct call to xdl_merge in
merge-file.c. If it were written today, this probably would
just use the ll_merge machinery. But it predates that code,
and uses slightly different options to xdl_merge (e.g.,
ZEALOUS_ALNUM).

We could try to abstract out an xdi_merge to match the
existing xdi_diff, but even that is difficult. Rather than
simply report error, we try to treat large files as binary,
and that distinction would happen outside of xdi_merge.

The simplest fix is to just replicate the MAX_XDIFF_SIZE
check in merge-file.c.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano