Johannes Schindelin 5e1d2f4ef6 Merge branch 'js/http-custom-headers' ...

Update tests for "http.extraHeaders=<header>" to be portable back
to Apache 2.2 (the original depended on <RequireAll/> which is a
more recent feature).

* js/http-custom-headers:
  submodule: ensure that -c http.extraheader is heeded
  t5551: make the test for extra HTTP headers more robust
  tests: adjust the configuration for Apache 2.2

Rebased-and-signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

2016-06-07 09:10:59 +02:00

..

add.c

Merge branch 'jc/add-u-A-default-to-top' into maint

2015-11-05 12:18:12 -08:00

am.c

Merge branch 'jc/am-i-v-fix' into maint

2016-03-10 11:13:41 -08:00

annotate.c

…

apply.c

builtin/apply: free patch when parse_chunk() fails

2016-04-01 10:21:55 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint

2016-04-29 14:15:58 -07:00

branch.c

Merge branch 'va/i18n-misc-updates' into maint

2016-05-26 13:17:20 -07:00

bundle.c

…

cat-file.c

cat-file: read batch stream with strbuf_getline()

2016-01-15 10:35:06 -08:00

check-attr.c

give "nbuf" strbuf a more meaningful name

2016-02-01 13:43:02 -08:00

check-ignore.c

give "nbuf" strbuf a more meaningful name

2016-02-01 13:43:02 -08:00

check-mailmap.c

strbuf: introduce strbuf_getline_{lf,nul}()

2016-01-15 10:12:51 -08:00

check-ref-format.c

use xmallocz to avoid size arithmetic

2016-02-22 14:51:09 -08:00

checkout-index.c

checkout-index: disallow "--no-stage" option

2016-02-01 13:43:49 -08:00

checkout.c

Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint

2016-03-10 11:13:39 -08:00

clean.c

Merge branch 'clean-long-paths'

2016-06-07 09:10:35 +02:00

clone.c

remote-helper: check helper status after import/export

2016-06-07 09:08:38 +02:00

column.c

column: read lines with strbuf_getline()

2016-01-15 10:35:07 -08:00

commit-tree.c

Convert struct object to object_id

2015-11-20 08:02:05 -05:00

commit.c

add infrastructure for read-only file system level caches

2016-06-07 09:07:33 +02:00

config.c

Merge branch 'jk/config-get-urlmatch' into maint

2016-04-14 18:57:43 -07:00

count-objects.c

…

credential.c

…

describe.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

diff-files.c

diff: run arguments through precompose_argv

2016-05-13 14:35:49 -07:00

diff-index.c

diff: run arguments through precompose_argv

2016-05-13 14:35:49 -07:00

diff-tree.c

Merge branch 'ar/diff-args-osx-precompose' into maint

2016-06-06 14:27:35 -07:00

diff.c

Merge branch 'ar/diff-args-osx-precompose' into maint

2016-06-06 14:27:35 -07:00

fast-export.c

fast-export: do not refer to non-existing marks

2016-06-07 09:08:38 +02:00

fetch-pack.c

fetch-pack: fix object_id of exact sha1

2016-03-01 11:19:19 -08:00

fetch.c

Merge branch 'jk/tighten-alloc'

2016-02-26 13:37:16 -08:00

fmt-merge-msg.c

Merge branch 'rs/pop-commit' into maint

2015-12-11 11:14:13 -08:00

for-each-ref.c

…

fsck.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

gc.c

Merge branch 'dk/gc-idx-wo-pack' into maint

2015-12-04 11:33:08 -08:00

get-tar-commit-id.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

grep.c

Merge branch 'jk/tighten-alloc' into maint

2016-03-10 11:13:43 -08:00

hash-object.c

Merge branch 'jk/options-cleanup'

2016-02-10 14:20:08 -08:00

help.c

convert trivial cases to FLEX_ARRAY macros

2016-02-22 14:51:09 -08:00

index-pack.c

Merge branch 'va/i18n-misc-updates' into maint

2016-05-26 13:17:20 -07:00

init-db.c

Merge branch 'jk/check-repository-format' into maint

2016-05-02 14:24:04 -07:00

interpret-trailers.c

interpret-trailers: add option for in-place editing

2016-01-14 12:22:17 -08:00

log.c

format-patch: introduce format.outputDirectory configuration

2016-01-13 10:55:01 -08:00

ls-files.c

Merge branch 'jk/options-cleanup'

2016-02-10 14:20:08 -08:00

ls-remote.c

ls-remote: add support for showing symrefs

2016-01-19 10:07:56 -08:00

ls-tree.c

…

mailinfo.c

mailinfo: libify

2015-10-21 15:59:34 -07:00

mailsplit.c

…

merge-base.c

convert trivial cases to ALLOC_ARRAY

2016-02-22 14:51:09 -08:00

merge-file.c

Merge branch 'jk/merge-file-exit-code' into maint

2015-11-03 15:32:41 -08:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

use xmallocz to avoid size arithmetic

2016-02-22 14:51:09 -08:00

merge.c

merge: fix NULL pointer dereference when merging nothing into void

2016-03-23 10:12:10 -07:00

mktag.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

mktree.c

Merge branch 'jk/tighten-alloc'

2016-02-26 13:37:16 -08:00

mv.c

Merge branch 'sb/mv-submodule-fix' into HEAD

2016-05-18 14:40:05 -07:00

name-rev.c

Merge branch 'js/name-rev-use-oldest-ref' into maint

2016-05-31 14:08:26 -07:00

notes.c

Merge branch 'sb/misc-cleanups' into HEAD

2016-05-18 14:40:15 -07:00

pack-objects.c

pack-objects: warn on split packs disabling bitmaps

2016-04-28 09:58:14 -07:00

pack-redundant.c

convert trivial cases to ALLOC_ARRAY

2016-02-22 14:51:09 -08:00

pack-refs.c

…

patch-id.c

usage: do not insist that standard input must come from a file

2015-10-16 15:27:52 -07:00

prune-packed.c

…

prune.c

Merge branch 'jk/repository-extension' into maint

2015-11-03 15:32:25 -08:00

pull.c

i18n: builtin/pull.c: split strings marked for translation

2016-04-19 12:07:49 -07:00

push.c

Merge branch 'mm/push-default-warning'

2016-02-26 13:37:25 -08:00

read-tree.c

…

receive-pack.c

use st_add and st_mult for allocation size computation

2016-02-22 14:51:09 -08:00

reflog.c

convert trivial cases to FLEX_ARRAY macros

2016-02-22 14:51:09 -08:00

remote-ext.c

typofix: assorted typofixes in comments, documentation and messages

2016-05-06 13:16:37 -07:00

remote-fd.c

…

remote.c

i18n: remote: add comment for translators

2016-05-09 12:20:40 -07:00

repack.c

strbuf: introduce strbuf_getline_{lf,nul}()

2016-01-15 10:12:51 -08:00

replace.c

Merge branch 'js/replace-edit-use-editor-configuration' into maint

2016-05-06 14:53:24 -07:00

rerere.c

…

reset.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

rev-list.c

Merge branch 'maint-2.4' into maint-2.5

2016-03-17 11:24:14 -07:00

rev-parse.c

Merge branch 'jk/rev-parse-local-env-vars' into maint

2016-04-14 18:57:44 -07:00

revert.c

…

rm.c

i18n: builtin/rm.c: remove a comma ',' from string

2016-04-12 10:48:28 -07:00

send-pack.c

Merge branch 'sk/send-pack-all-fix' into maint

2016-04-29 14:15:57 -07:00

shortlog.c

Merge branch 'jk/shortlog'

2016-01-28 16:10:14 -08:00

show-branch.c

Merge branch 'rs/show-branch-argv-array' into maint

2015-12-11 11:14:14 -08:00

show-ref.c

show-ref: stop using PARSE_OPT_NO_INTERNAL_HELP

2015-11-20 08:02:07 -05:00

stripspace.c

stripspace: call U+0020 a "space" instead of a "blank"

2016-01-29 16:02:34 -08:00

submodule--helper.c

submodule: stop sanitizing config options

2016-06-07 09:10:52 +02:00

symbolic-ref.c

symbolic-ref: propagate error code from create_symref()

2015-12-21 12:03:03 -08:00

tag.c

tag: do not show ambiguous tag names as "tags/foo"

2016-01-26 13:34:10 -08:00

unpack-file.c

…

unpack-objects.c

Remove get_object_hash.

2015-11-20 08:02:05 -05:00

update-index.c

Merge branch 'jk/options-cleanup'

2016-02-10 14:20:08 -08:00

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

Merge branch 'jk/tighten-alloc'

2016-02-26 13:37:16 -08:00

write-tree.c

…