delta/git.git, branch nd/diff-flush-before-warning

diff.c: flush stdout before printing rename warnings

2018-01-16T22:34:20+00:00

The diff output is buffered in a FILE object and could still be
partially buffered when we print these warnings (directly to fd 2).
The output is messed up like this

 worktree.c                                   |   138 +-
 worktree.h        warning: inexact rename detection was skipped due to too many files.
                           |    12 +-
 wrapper.c                                    |    83 +-

It gets worse if the warning is printed after color codes for the graph
part are already printed. You'll get a warning in green or red.

Flush stdout first, so we can get something like this instead:

 xdiff/xutils.c                               |    42 +-
 xdiff/xutils.h                               |     4 +-
 1033 files changed, 150824 insertions(+), 69395 deletions(-)
warning: inexact rename detection was skipped due to too many files.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

Git 2.10.5

2017-09-22T05:42:22+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jk/safe-pipe-capture' into maint-2.10

2017-09-22T05:34:34+00:00

Merge branch 'jk/cvsimport-quoting' into maint-2.10

2017-09-22T05:34:34+00:00

Merge branch 'jc/cvsserver' into maint-2.10

2017-09-22T05:34:34+00:00

Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10

2017-09-22T05:34:34+00:00

cvsimport: shell-quote variable used in backticks

2017-09-12T02:10:22+00:00

We run `git rev-parse` though the shell, and quote its
argument only with single-quotes. This prevents most
metacharacters from being a problem, but misses the obvious
case when $name itself has single-quotes in it. We can fix
this by applying the usual shell-quoting formula.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

archimport: use safe_pipe_capture for user input

2017-09-12T02:08:15+00:00

Refnames can contain shell metacharacters which need to be
passed verbatim to sub-processes. Using safe_pipe_capture
skips the shell entirely.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

shell: drop git-cvsserver support by default

2017-09-12T02:05:58+00:00

The git-cvsserver script is old and largely unmaintained
these days. But git-shell allows untrusted users to run it
out of the box, significantly increasing its attack surface.

Let's drop it from git-shell's list of internal handlers so
that it cannot be run by default.  This is not backwards
compatible. But given the age and development activity on
CVS-related parts of Git, this is likely to impact very few
users, while helping many more (i.e., anybody who runs
git-shell and had no intention of supporting CVS).

There's no configuration mechanism in git-shell for us to
add a boolean and flip it to "off". But there is a mechanism
for adding custom commands, and adding CVS support here is
fairly trivial. Let's document it to give guidance to
anybody who really is still running cvsserver.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

cvsserver: use safe_pipe_capture for `constant commands` as well

2017-09-11T05:52:29+00:00

This is not strictly necessary, but it is a good code hygiene.

Signed-off-by: Junio C Hamano