Fix profile-feedback build broken in 2.1 for tarball releases.

* jk/fix-profile-feedback-build:
  Makefile: make perf tests optional for profile build

* git://github.com/git-l10n/git-po:
  l10n: de.po: improve message when switching branches
  l10n: de.po: fix typo
  po/TEAMS: Add Catalan team
  l10n: Add Catalan translation
  l10n: fr.po (2257t) update for version 2.1.0
  l10n: sv.po: Update Swedish translation (2257t0f0u)
  l10n: vi.po (2257t): Update translation
  l10n: Updated Bulgarian translation of git (2257t,0f,0u)
  l10n: zh_CN: translations for git v2.1.0-rc0
  l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)
  l10n: Updated Bulgarian translation of git (2247t,0f,0u)
  l10n: Updated Bulgarian translation of git (2228t,0f,0u)
  l10n: Fix more typos in the Swedish translations

Suggested-by: NStefan Beller <stefanbeller@gmail.com>
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

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

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

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

The perf tests need a repository to operate on; if none is
defined, we fall back to the repository containing our build
directory.  That fails, though, for an exported tarball of
git.git, which has no repository.

Since 5d7fd6d0 we run the perf tests as part of "make
profile". Therefore "make profile" fails out of the box on
released tarballs of v2.1.0.

We can fix this by making the perf tests optional; if they
are skipped, we still run the regular test suite, which
should give a lot of profile data (and is what we used to do
prior to 5d7fd6d0 anyway).
Signed-off-by: NJeff King <peff@peff.net>
Acked-by: NAndi Kleen <ak@linux.intel.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

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

The helper function test_i18ngrep pretends that it found the expected
results when it is running under GETTEXT_POISON. For this reason, it must
not be used negated like so

   ! test_i18ngrep foo bar

because the test case would fail under GETTEXT_POISON. The function offers
a special syntax to test that a pattern is *not* found:

   test_i18ngrep ! foo bar

Convert incorrect uses to this syntax.
Signed-off-by: NJohannes Sixt <j6t@kdbg.org>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* 'master' of git://ozlabs.org/~paulus/gitk:
  gitk: Updated Bulgarian translation (302t,0f,0u)
  gitk: Add keybinding to switch to parent commit

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

Signed-off-by: NAlexander Shopov <ash@kambanaria.org>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

Signed-off-by: NMax Kirillov <max@max630.net>
Signed-off-by: NPaul Mackerras <paulus@samba.org>

* mb/relnotes-2.1:
  Release notes: grammatical fixes
  RelNotes: no more check_ref_format micro-optimization

Signed-off-by: NMarc Branchaud <marcnarc@xiplink.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Inspired by 2147fa7e (2014-07-31 git-push: fix link in man page),
I grepped through the whole tree searching for 'gitlink:' occurrences.
Signed-off-by: NStefan Beller <stefanbeller@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

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

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

* l10n/vi/vnwildman/master:
  l10n: vi.po (2257t): Update translation

* 'master' of github.com:alshopov/git-po:
  l10n: Updated Bulgarian translation of git (2257t,0f,0u)

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

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

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

* tf/maint-doc-push:
  git-push: fix link in man page

* ta/doc-config:
  add documentation for writing config files

Sync with tags v2.1.0-rc1 and v2.0.4
Signed-off-by: NAlexander Shopov <ash@kambanaria.org>

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

* commit 'bg/alshopov/master':
  l10n: Updated Bulgarian translation of git (2247t,0f,0u)
  l10n: Updated Bulgarian translation of git (2228t,0f,0u)

* sv/nafmo/master:
  l10n: Fix more typos in the Swedish translations

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

Used make po/git.pot from git-l10n/git-po/master
Signed-off-by: NAlexander Shopov <ash@kambanaria.org>

Used po/git.pot from git-l10n/git-po/master
Signed-off-by: NAlexander Shopov <ash@kambanaria.org>

Signed-off-by: NTony Finch <dot@dotat.at>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint:
  Git 2.0.4
  commit --amend: test specifies authorship but forgets to check

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

* jk/more-push-completion:
  completion: complete `git push --force-with-lease=`
  completion: add some missing options to `git push`
  completion: complete "unstuck" `git push --recurse-submodules`

Make tests pass on msysgit by mostly disabling ones that are
infeasible on that platform.

* sk/mingw-tests-workaround:
  t800[12]: work around MSys limitation
  t9902: mingw-specific fix for gitfile link files
  t4210: skip command-line encoding tests on mingw
  MinGW: disable legacy encoding tests
  t0110/MinGW: skip tests that pass arbitrary bytes on the command line
  MinGW: Skip test redirecting to fd 4

Most of these are battle-tested in msysgit and are needed to
complete what has been merged to 'master' already.

* sk/mingw-uni-fix-more:
  Win32: enable color output in Windows cmd.exe
  Win32: patch Windows environment on startup
  Win32: keep the environment sorted
  Win32: use low-level memory allocation during initialization
  Win32: reduce environment array reallocations
  Win32: don't copy the environment twice when spawning child processes
  Win32: factor out environment block creation
  Win32: unify environment function names
  Win32: unify environment case-sensitivity
  Win32: fix environment memory leaks
  Win32: Unicode environment (incoming)
  Win32: Unicode environment (outgoing)
  Revert "Windows: teach getenv to do a case-sensitive search"
  tests: do not pass iso8859-1 encoded parameter

* ep/avoid-test-a-o:
  t9814: fix misconversion from test $a -o $b to test $a || test $b

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