git/t, branch v2.3.1

Merge branch 'jc/apply-ws-fix-expands' into maint

2015-02-25T06:10:41Z

"git apply --whitespace=fix" used to under-allocate the memory when the fix resulted in a longer text than the original patch. * jc/apply-ws-fix-expands: apply: count the size of postimage correctly apply: make update_pre_post_images() sanity check the given postlen apply.c: typofix

Merge branch 'jk/dumb-http-idx-fetch-fix' into maint

2015-02-25T06:10:37Z

A broken pack .idx file in the receiving repository prevented the dumb http transport from fetching a good copy of it from the other side. * jk/dumb-http-idx-fetch-fix: dumb-http: do not pass NULL path to parse_pack_index

Merge branch 'dk/format-patch-ignore-diff-submodule' into maint

2015-02-25T06:10:15Z

Setting diff.submodule to 'log' made "git format-patch" produce broken patches. * dk/format-patch-ignore-diff-submodule: format-patch: ignore diff.submodule setting t4255: test am submodule with diff.submodule

dumb-http: do not pass NULL path to parse_pack_index

2015-01-27T20:41:45Z

Once upon a time, dumb http always fetched .idx files directly into their final location, and then checked their validity with parse_pack_index. This was refactored in commit 750ef42 (http-fetch: Use temporary files for pack-*.idx until verified, 2010-04-19), which uses the following logic: 1. If we have the idx already in place, see if it's valid (using parse_pack_index). If so, use it. 2. Otherwise, fetch the .idx to a tempfile, check that, and if so move it into place. 3. Either way, fetch the pack itself if necessary. However, it got step 1 wrong. We pass a NULL path parameter to parse_pack_index, so an existing .idx file always looks broken. Worse, we do not treat this broken .idx as an opportunity to re-fetch, but instead return an error, ignoring the pack entirely. This can lead to a dumb-http fetch failing to retrieve the necessary objects. This doesn't come up much in practice, because it must be a packfile that we found out about (and whose .idx we stored) during an earlier dumb-http fetch, but whose packfile we _didn't_ fetch. I.e., we did a partial clone of a repository, didn't need some packfiles, and now a followup fetch needs them. Discovery and tests by Charles Bailey . Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'js/t1050'

2015-01-22T21:46:45Z

* js/t1050: t1050-large: generate large files without dd

Merge branch 'jh/empty-notes'

2015-01-22T21:42:37Z

* jh/empty-notes: Fix unclosed here document in t3301.sh

apply: make update_pre_post_images() sanity check the given postlen

2015-01-22T20:57:24Z

"git apply --whitespace=fix" used to be able to assume that fixing errors will always reduce the size by e.g. stripping whitespaces at the end of lines or collapsing runs of spaces into tabs at the beginning of lines. An update to accomodate fixes that lengthens the result by e.g. expanding leading tabs into spaces were made long time ago but the logic miscounted the necessary space after such whitespace fixes, leading to either under-allocation or over-usage of already allocated space. Illustrate this with a runtime sanity-check to protect us from future breakage. The test was stolen from Kyle McKay who helped to identify the problem. Helped-by: "Kyle J. McKay" Signed-off-by: Junio C Hamano

Fix unclosed here document in t3301.sh

2015-01-22T20:23:42Z

Commit 908a3203632a02568df230c0fccf9a2cd8da24e6 introduced indentation to here documents in t3301.sh. However in one place <<-EOF was missing -, which broke this test when run with mksh-50d. This commit fixes it. Signed-off-by: Kacper Kornet Acked-by: Johan Herland Signed-off-by: Junio C Hamano

Merge branch 'jk/colors'

2015-01-20T23:57:22Z

* jk/colors: parse_color: fix return value for numeric color values 0-8

parse_color: fix return value for numeric color values 0-8

2015-01-20T23:56:03Z

When commit 695d95d refactored the color parsing, it missed a "return 0" when parsing literal numbers 0-8 (which represent basic ANSI colors), leading us to report these colors as an error. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano