Add an Accept-Language header which indicates the user's preferred
languages defined by $LANGUAGE, $LC_ALL, $LC_MESSAGES and $LANG.

Examples:
  LANGUAGE= -> ""
  LANGUAGE=ko:en -> "Accept-Language: ko, en;q=0.9, *;q=0.1"
  LANGUAGE=ko LANG=en_US.UTF-8 -> "Accept-Language: ko, *;q=0.1"
  LANGUAGE= LANG=en_US.UTF-8 -> "Accept-Language: en-US, *;q=0.1"

This gives git servers a chance to display remote error messages in
the user's preferred language.

Limit the number of languages to 1,000 because q-value must not be
smaller than 0.001, and limit the length of Accept-Language header to
4,000 bytes for some HTTP servers which cannot accept such long header.
Signed-off-by: NYi EungJun <eungjun.yi@navercorp.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* git://github.com/git-l10n/git-po:
  l10n: de.po: correct singular form
  l10n: de.po: translate "leave behind" correctly
  l10n: de.po: fix typo
  l10n: ca.po: update translation

* 'master' of git://github.com/alexhenrie/git-po:
  l10n: ca.po: update translation

Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

This message is about leaving orphaned commits behind, not about
behind an upstream branch. Try to make this clear.
Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

Signed-off-by: NBenedikt Heine <bebe@bebehei.de>
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

Signed-off-by: NAlex Henrie <alexhenrie24@gmail.com>

* js/t1050:
  t1050-large: generate large files without dd

* ak/cat-file-clean-up:
  cat-file: use "type" and "size" from outer scope

* git://github.com/git-l10n/git-po:
  l10n: correct indentation of show-branch usage
  l10n: de.po: translate 3 messages
  l10n: zh_CN: various fixes on command arguments
  l10n: vi.po(2298t): Updated 3 new strings
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 2
  l10n: git.pot: v2.3.0 round 2 (3 updated)
  l10n: de.po: translate 13 new messages
  l10n: de.po: fix typo
  l10n: de.po: translate "track" as "versionieren"
  l10n: zh_CN: translations for git v2.3.0-rc0
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 1
  l10n: vi.po(2298t): Updated and change Plural-Forms
  l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
  l10n: ca.po: various fixes

* sh/asciidoc-git-version-fix:
  Documentation: fix version numbering

Version numbers in asciidoc-generated content (such as man pages)
went missing as of da8a3664 (Documentation: refactor common operations
into variables).  Fix by putting the underscore back in the variable
name.
Signed-off-by: NSven van Haastregt <svenvh@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* jh/empty-notes:
  Fix unclosed here document in t3301.sh

Commit 908a3203 introduced  indentation
to here documents in t3301.sh. However in one place <<-EOF was missing
-, which broke this test when run with mksh-50d. This commit fixes it.
Signed-off-by: NKacper Kornet <draenog@pld-linux.org>
Acked-by: NJohan Herland <johan@herland.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

An indentation error was found right after we started l10n round 2, and
commit d6589d1b (show-branch: fix indentation of usage string) and this
update would fix it.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* 'master' of git://github.com/git-l10n/git-po:
  l10n: de.po: translate 3 messages
  l10n: zh_CN: various fixes on command arguments
  l10n: vi.po(2298t): Updated 3 new strings
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 2
  l10n: git.pot: v2.3.0 round 2 (3 updated)
  l10n: de.po: translate 13 new messages
  l10n: de.po: fix typo
  l10n: de.po: translate "track" as "versionieren"
  l10n: zh_CN: translations for git v2.3.0-rc0
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 1
  l10n: vi.po(2298t): Updated and change Plural-Forms
  l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
  l10n: ca.po: various fixes

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* jk/http-push-symref-fix:
  http-push: trim trailing newline from remote symref

* ak/show-branch-usage-string:
  show-branch: fix indentation of usage string

Noticed-by: NJean-Noël Avila <jn.avila@free.fr>
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* jk/colors:
  parse_color: fix return value for numeric color values 0-8

When commit 695d95df refactored the color parsing, it missed
a "return 0" when parsing literal numbers 0-8 (which
represent basic ANSI colors), leading us to report these
colors as an error.
Signed-off-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

Updated translations for Git 2.3.0 l10n round 2, and fixed various
translations for command arguments.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* 'v2.3.0' of git://github.com/jnavila/git:
  l10n: fr.po v2.3.0 round 2

* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (2298t0f0u)

Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>

Signed-off-by: NPeter Krefting <peter@softwolves.pp.se>

Signed-off-by: NJean-Noel Avila <jn.avila@free.fr>

Generate po/git.pot from v2.3.0-rc0-44-ga94655dc for git v2.3.0 l10n
round 2.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* 'master' of git://github.com/git-l10n/git-po:
  l10n: de.po: translate 13 new messages
  l10n: de.po: fix typo
  l10n: de.po: translate "track" as "versionieren"
  l10n: zh_CN: translations for git v2.3.0-rc0
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 1
  l10n: vi.po(2298t): Updated and change Plural-Forms
  l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
  l10n: ca.po: various fixes

Translate 13 new messages came from git.pot update in
beb691f7 (l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)).
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

Suggested-by: NTorsten Bögershausen <tboegi@web.de>
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

Translate 13 new messages (2298t0f0u) for git v2.3.0-rc0.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

It's a simple matter of opening the directory specified in the gitfile.

[ew: tweaked check to avoid open() on directories]
Signed-off-by: NRamkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: NEric Wong <normalperson@yhbt.net>

ref_id should not match "refs/remotes/".

[ew: dropped initial hunk for GIT_SVN_ID at Ramkumar's request]
Signed-off-by: NRamkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: NEric Wong <normalperson@yhbt.net>

Signed-off-by: NPeter Krefting <peter@softwolves.pp.se>

For some unknown reason, the dd on my Windows box segfaults randomly,
but since recently, it does so much more often than it used to, which
makes running the test suite burdensome.

Use printf to write large files instead of dd. To emphasize that three
of the large blobs are exact copies, use cp to allocate them.

The new code makes the files a bit smaller, and they are not sparse
anymore, but the tests do not depend on these properties. We do not want
to use test-genrandom here (which is used to generate large files
elsewhere in t1050), so that the files can be compressed well (which
keeps the run-time short).

The files are now large text files, not binary files. But since they
are larger than core.bigfilethreshold they are diagnosed as binary
by Git. For this reason, the 'git diff' tests that check the output
for "Binary files differ" still pass.
Signed-off-by: NJohannes Sixt <j6t@kdbg.org>
Reviewed-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Hopefully this will be the final feature update for 2.3-rc1
Signed-off-by: NJunio C Hamano <gitster@pobox.com>