delta/git.git, branch ar/ellipsis

Testing: provide tests requiring them with ellipses after SHA-1 values

2017-11-14T06:44:40+00:00

Where needed, we arrange for invocations of Git as if

   "-c core.printsha1ellipsis=true"

had been specified on the command-line.  This furnishes ellipses in the
output which then matches what is expected.

Signed-off-by: Ann T Ropea 
Signed-off-by: Junio C Hamano

Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").

2017-11-14T06:44:40+00:00

Signed-off-by: Ann T Ropea 
Signed-off-by: Junio C Hamano

Documentation: user-manual: limit usage of ellipsis

2017-11-14T06:44:40+00:00

Confusing the ellipsis with the three-dot operator should be made as
difficult as possible.

Signed-off-by: Ann T Ropea 
Signed-off-by: Junio C Hamano

diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value

2017-11-14T06:44:40+00:00

Neither Git nor the user are in need of this (visual) aid anymore, but
we must offer a transition period.

Also, fix a typo: "abbbreviated" ---> "abbreviated".

Signed-off-by: Ann T Ropea 
Signed-off-by: Junio C Hamano

checkout: describe_detached_head: remove ellipsis after committish

2017-11-14T06:44:40+00:00

We do not want an ellipsis displayed following an (abbreviated) SHA-1
value.

The days when this was necessary to indicate the truncation to
lower-level Git commands and/or the user are bygone.

However, to ease the transition, the ellipsis will still be printed if
the user (actively!) sets the config option core.printsha1ellipsis to
true.

Signed-off-by: Ann T Ropea 
Signed-off-by: Junio C Hamano

config: introduce core.printsha1ellipsis

2017-11-14T06:44:40+00:00

We use it to ascertain whether or not the user wants an ellipsis
printed after an abbreviated SHA-1 value.

By de-asserting it in the default, we encourage not printing the
ellipsis in such circumstances.

Not adding a corresponding cli option is intentional; and we would like
to remove the config option *and* the ellipses after abbreviated SHA-1
values after a respectable period.

Signed-off-by: Ann T Ropea 
Signed-off-by: Junio C Hamano

Merge branch 'jm/status-ignored-files-list'

2017-11-13T05:44:59+00:00

The set of paths output from "git status --ignored" was tied
closely with its "--untracked=" option, but now it can be
controlled more flexibly.  Most notably, a directory that is
ignored because it is listed to be ignored in the ignore/exclude
mechanism can be handled differently from a directory that ends up
to be ignored only because all files in it are ignored.

* jm/status-ignored-files-list:
  status: test ignored modes
  status: document options to show matching ignored files
  status: report matching ignored and normal untracked
  status: add option to show ignored files differently

RelNotes: the third batch for 2.16

2017-11-09T05:36:39+00:00

Signed-off-by: Junio C Hamano

Merge branch 'js/mingw-redirect-std-handles'

2017-11-09T05:31:31+00:00

MinGW updates.

* js/mingw-redirect-std-handles:
  mingw: document the standard handle redirection
  mingw: optionally redirect stderr/stdout via the same handle
  mingw: add experimental feature to redirect standard handles

Merge branch 'js/wincred-empty-cred'

2017-11-09T05:31:31+00:00

MinGW updates.

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