delta/git.git/contrib, branch ws/curl-http-proxy-over-https

Merge branch 'tz/complete-branch-copy' into maint

2017-12-06T17:09:02+00:00

Command line completion (in contrib/) has been taught about the
"--copy" option of "git branch".

* tz/complete-branch-copy:
  completion: add '--copy' option to 'git branch'

Merge branch 'tz/fsf-address-update' into maint

2017-11-21T05:05:32+00:00

Replace the mailing address of FSF to a URL, as FSF prefers.

* tz/fsf-address-update:
  Replace Free Software Foundation address in license notices
  Replace Free Software Foundation address in license notices

completion: add '--copy' option to 'git branch'

2017-11-17T01:32:19+00:00

In 52d59cc645 (branch: add a --copy (-c) option to go with --move (-m),
2017-06-18), `git branch` learned a `--copy` option.  Include it when
providing command completions.

Signed-off-by: Todd Zullinger 
Signed-off-by: Junio C Hamano

Merge branch 'js/wincred-empty-cred' into maint

2017-11-15T03:05:03+00:00

MinGW updates.

* js/wincred-empty-cred:
  wincred: handle empty username/password correctly
  t0302: check helper can handle empty credentials

Merge branch 'dk/libsecret-unlock-to-load-fix' into maint

2017-11-15T03:05:02+00:00

The credential helper for libsecret (in contrib/) has been improved
to allow possibly prompting the end user to unlock secrets that are
currently locked (otherwise the secrets may not be loaded).

* dk/libsecret-unlock-to-load-fix:
  credential-libsecret: unlock locked secrets

Replace Free Software Foundation address in license notices

2017-11-09T04:21:21+00:00

The mailing address for the FSF has changed over the years.  Rather than
updating the address across all files, refer readers to gnu.org, as the
GNU GPL documentation now suggests for license notices.  The mailing
address is retained in the full license files (COPYING and LGPL-2.1).

The old address is still present in t/diff-lib/COPYING.  This is
intentional, as the file is used in tests and the contents are not
expected to change.

Signed-off-by: Todd Zullinger 
Signed-off-by: Junio C Hamano

credential-libsecret: unlock locked secrets

2017-11-04T01:59:21+00:00

Credentials exposed by the secret service DBUS interface may be locked.
Setting the SECRET_SEARCH_UNLOCK flag will make the secret service
unlock these secrets, possibly prompting the user for credentials to do
so. Without this flag, the secret is simply not loaded.

Signed-off-by: Dennis Kaarsemaker 
Signed-off-by: Junio C Hamano

wincred: handle empty username/password correctly

2017-11-01T04:46:39+00:00

Empty (length 0) usernames and/or passwords, when saved in the Windows
Credential Manager, come back as null when reading the credential.

One use case for such empty credentials is with NTLM authentication, where
empty username and password instruct libcurl to authenticate using the
credentials of the currently logged-on user (single sign-on).

When locating the relevant credentials, make empty username match null.
When outputting the credentials, handle nulls correctly.

Signed-off-by: Jakub Bereżański 
Signed-off-by: Junio C Hamano

completion: add remaining flags to checkout

2017-10-25T06:12:46+00:00

In the commits 1fc458d9 (builtin/checkout: add --recurse-submodules
switch, 2017-03-14), 08d595dc (checkout: add --ignore-skip-worktree-bits
in sparse checkout mode, 2013-04-13) and 32669671 (checkout: introduce
--detach synonym for "git checkout foo^{commit}", 2011-02-08) checkout
gained new flags but the completion was not updated, although these flags
are useful completions. Add them.

The flags --force and --ignore-other-worktrees are not added as they are
potentially dangerous.

The flags --progress and --no-progress are only useful for scripting and are
therefore also not included.

Signed-off-by: Thomas Braun 
Reviewed-by: Johannes Sixt 
Signed-off-by: Junio C Hamano

Merge branch 'tb/complete-describe'

2017-10-11T05:52:23+00:00

Docfix.

* tb/complete-describe:
  completion: add --broken and --dirty to describe