delta/git.git, branch sb/diff-cleanup

diff: remove dead code

2016-09-08T20:54:37+00:00

When `len < 1`, len has to be 0 or negative, emit_line will then remove the
first character and by then `len` would be negative. As this doesn't
happen, it is safe to assume it is dead code.

This continues to simplify the code, which was started in b8d9c1a66b
(2009-09-03,  diff.c: the builtin_diff() deals with only two-file
comparison).

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

diff: omit found pointer from emit_callback

2016-09-08T20:54:23+00:00

We keep the actual data in the diff options, which are just as accessible.
Remove the pointer stored in struct emit_callback for readability.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

diff.c: use diff_options directly

2016-09-08T20:46:46+00:00

The value of `ecbdata->opt` is accessible via the short variable `o`
already, so let's use that instead.

Signed-off-by: Stefan Beller 
Signed-off-by: Junio C Hamano

Git 2.10

2016-09-02T16:05:47+00:00

Signed-off-by: Junio C Hamano

Merge tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-po

2016-09-02T15:48:14+00:00

l10n-2.10.0-rnd2.2

* tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-po:
  l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)

Merge branch 'master' of https://github.com/vnwildman/git

2016-09-02T13:29:48+00:00

* 'master' of https://github.com/vnwildman/git:
  l10n: Updated Vietnamese translation for v2.10.0-rc2 (2757t)

A few more fixes before the final 2.10

2016-08-31T17:21:05+00:00

Signed-off-by: Junio C Hamano

Merge tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-po

2016-08-31T17:04:14+00:00

l10n-2.10.0-rnd2

* tag 'l10n-2.10.0-rnd2' of git://github.com/git-l10n/git-po:
  l10n: zh_CN: for git v2.10.0 l10n round 2
  l10n: ca.po: update translation
  l10n: fr.po v2.10.0-rc2
  l10n: sv.po: Update Swedish translation (2757t0f0u)
  l10n: git.pot: v2.10.0 round 2 (12 new, 44 removed)
  l10n: Updated Vietnamese translation for v2.10.0 (2789t)
  l10n: pt_PT: update Portuguese translation
  l10n: pt_PT: merge git.pot
  l10n: ko.po: Update Korean translation
  l10n: git.pot: v2.10.0 round 1 (248 new, 56 removed)

Merge branch 'ls/packet-line-protocol-doc-fix'

2016-08-31T17:03:51+00:00

Correct an age-old calco (is that a typo-like word for calc)
in the documentation.

* ls/packet-line-protocol-doc-fix:
  pack-protocol: fix maximum pkt-line size

Merge branch 'mh/blame-worktree'

2016-08-31T17:03:50+00:00

* mh/blame-worktree:
  blame: fix segfault on untracked files