git/contrib/completion, branch v2.16.2

Merge branch 'ra/prompt-eread-fix'

2017-12-28T22:08:45Z

Update the shell prompt script (in contrib/) to strip trailing CR from strings read from various "state" files. * ra/prompt-eread-fix: git-prompt: fix reading files with windows line endings git-prompt: make __git_eread intended use explicit

git-prompt: fix reading files with windows line endings

2017-12-06T18:08:13Z

If any of the files read by __git_eread have \r\n line endings, read will only strip \n, leaving \r. This results in an ugly prompt, where instead of user@pc MINGW64 /path/to/repo (BARE:master) the last parenthesis is printed over the beginning of the prompt like )ser@pc MINGW64 /path/to/repo (BARE:master This patch fixes the issue by changing the internal field separator variable IFS to $'\r\n' before using the read builtin command. Note that ANSI-C Quoting/POSIX Quoting ($'...') is supported by bash as well as zsh, which are the current targets of git-prompt, cf. contrib/completion/git-prompt.sh. Signed-off-by: Robert Abel Signed-off-by: Junio C Hamano

git-prompt: make __git_eread intended use explicit

2017-12-06T18:08:12Z

__git_eread is used to read a single line of a given file (if it exists) into a single variable stripping the EOL. This patch removes the unused capability to split file contents into tokens by passing multiple variable names. Add a comment and explicitly use $2 instead of misleading $@ as argument to the read builtin command. Signed-off-by: Robert Abel Signed-off-by: Junio C Hamano

Merge branch 'ac/complete-pull-autostash'

2017-12-06T17:23:37Z

The shell completion (in contrib/) learned that "git pull" can take the "--autostash" option. * ac/complete-pull-autostash: completion: add --autostash and --no-autostash to pull

Merge branch 'tz/complete-branch-copy'

2017-11-27T02:06:37Z

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 'rv/sendemail-tocmd-in-config-and-completion'

2017-11-27T02:06:32Z

Teach "sendemail.tocmd" to places that know about "sendemail.to", like documentation and shell completion (in contrib/). * rv/sendemail-tocmd-in-config-and-completion: completion: add git config sendemail.tocmd Documentation/config: add sendemail.tocmd to list preceding "See git-send-email(1)"

Merge branch 'jc/ignore-cr-at-eol'

2017-11-27T02:06:31Z

The "diff" family of commands learned to ignore differences in carriage return at the end of line. * jc/ignore-cr-at-eol: diff: --ignore-cr-at-eol xdiff: reassign xpparm_t.flags bits

completion: add --autostash and --no-autostash to pull

2017-11-22T07:31:43Z

Ideally we should only autocomplete if pull has --rebase since they only work with it but could not figure out how to do that and the error message of doing git pull --autostash points out that you need --rebase so i guess it's good enough Signed-off-by: Albert Astals Cid Signed-off-by: Junio C Hamano

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

2017-11-21T05:05:32Z

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:19Z

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