git, branch v2.22.0-rc1

Git 2.22-rc1

2019-05-19T07:46:42Z

Signed-off-by: Junio C Hamano

Merge branch 'js/difftool-no-index'

2019-05-19T07:45:35Z

The "--dir-diff" mode of "git difftool" is not useful in "--no-index" mode; they are now explicitly marked as mutually incompatible. * js/difftool-no-index: difftool --no-index: error out on --dir-diff (and don't crash)

Merge branch 'jk/get-oid-indexed-object-name'

2019-05-19T07:45:35Z

The codepath to parse : that obtains the object name for an indexed object has been made more robust. * jk/get-oid-indexed-object-name: get_oid: handle NULL repo->index

Merge branch 'jc/set-packet-header-signature-fix'

2019-05-19T07:45:35Z

Code clean-up. * jc/set-packet-header-signature-fix: pkt-line: drop 'const'-ness of a param to set_packet_header()

Merge branch 'cb/http-push-null-in-message-fix'

2019-05-19T07:45:35Z

Code clean-up. * cb/http-push-null-in-message-fix: http-push: prevent format overflow warning with gcc >= 9

Merge branch 'js/stash-in-c-use-builtin-doc'

2019-05-19T07:45:34Z

Doc update. * js/stash-in-c-use-builtin-doc: stash: document stash.useBuiltin

Merge branch 'tz/test-lib-check-working-jgit'

2019-05-19T07:45:34Z

A prerequiste check in the test suite to see if a working jgit is available was made more robust. * tz/test-lib-check-working-jgit: test-lib: try harder to ensure a working jgit

Merge branch 'js/parseopt-unknown-cb-returns-an-enum'

2019-05-19T07:45:34Z

Code clean-up. * js/parseopt-unknown-cb-returns-an-enum: parse-options: adjust `parse_opt_unknown_cb()`s declared return type

Merge branch 'ab/sha1dc'

2019-05-19T07:45:34Z

Update collision-detecting SHA-1 code to build properly on HP-UX. * ab/sha1dc: sha1dc: update from upstream

Merge branch 'js/rebase-i-label-shown-in-status-fix'

2019-05-19T07:45:33Z

"git status" did not know that the "label" instruction in the todo-list "rebase -i -r" uses should not be shown as a hex object name. * js/rebase-i-label-shown-in-status-fix: status: fix display of rebase -ir's `label` command