* cm/remote-mediawiki-perlcritique: (31 commits)
  git-remote-mediawiki: make error message more precise
  git-remote-mediawiki: add a perlcritic rule in Makefile
  git-remote-mediawiki: add a .perlcriticrc file
  git-remote-mediawiki: clearly rewrite double dereference
  git-remote-mediawiki: fix a typo ("mediwiki" instead of "mediawiki")
  git-remote-mediawiki: put non-trivial numeric values in constants.
  git-remote-mediawiki: don't use quotes for empty strings
  git-remote-mediawiki: replace "unless" statements with negated "if" statements
  git-remote-mediawiki: brace file handles for print for more clarity
  git-remote-mediawiki: modify strings for a better coding-style
  git-remote-mediawiki: put long code into a subroutine
  git-remote-mediawiki: remove import of unused open2
  git-remote-mediawiki: check return value of open
  git-remote-mediawiki: assign a variable as undef and make proper indentation
  git-remote-mediawiki: rename a variable ($last) which has the name of a keyword
  git-remote-mediawiki: remove unused variable $entry
  git-remote-mediawiki: turn double-negated expressions into simple expressions
  git-remote-mediawiki: change the name of a variable
  git-remote-mediawiki: add newline in the end of die() error messages
  git-remote-mediawiki: change style in a regexp
  ...

* bp/remote-mw-tests:
  git-remote-mediawiki: remove hardcoded version number in the test suite

* rr/rebase-autostash:
  rebase: finish_rebase() in noop rebase
  rebase: finish_rebase() in fast-forward rebase
  rebase: guard against missing files in read_basic_state()

* rr/prompt-rebase-breakage-fix:
  prompt: squelch error output from cat

"git status" learned status.branch and status.short configuration
variables to use --branch and --short options by default (override
with --no-branch and --no-short options from the command line).

* jg/status-config:
  status: introduce status.branch to enable --branch by default
  status: introduce status.short to enable --short by default

* maint:
  completion: complete diff --word-diff

Prior to commit 81d340d4, we did not print any error message
if a remote transport helper died unexpectedly. If a helper
did not print any error message (e.g., because it crashed),
the user could be left confused. That commit tried to
rectify the situation by printing a note that the helper
exited unexpectedly.

However, this makes a much more common case worse: when a
helper does die with a useful message, we print the extra
"Reading from 'git-remote-foo failed" message. This can also
end up confusing users, as they may not even know what
remote helpers are (e.g., the fact that http support comes
through git-remote-https is purely an implementation detail
that most users do not know or care about).

Since we do not have a good way of knowing whether the
helper printed a useful error, and since the common failure
mode is for it to do so, let's default to remaining quiet.
Debuggers can dig further by setting GIT_TRANSPORT_HELPER_DEBUG.
Signed-off-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NRamkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* cm/remote-mediawiki:
  git-remote-mediawiki: display message when launched directly

Code cleanup.

* rs/match-trees-refactor:
  match-trees: factor out fill_tree_desc_strict

Code cleanup.

* rs/logical-vs-binary-or:
  use logical OR (||) instead of binary OR (|) in logical context

Flip the default for color.ui to 'auto', which is what many
tutorials recommend new users to do.

* mm/color-auto-default:
  make color.ui default to 'auto'
  config: refactor management of color.ui's default value

* rs/discard-index-discard-array:
  read-cache: free cache in discard_index
  read-cache: add simple performance test

* nd/traces:
  git.txt: document GIT_TRACE_PACKET
  core: use env variable instead of config var to turn on logging pack access

* fc/show-non-empty-errors-in-test:
  test: test_must_be_empty helper

Makefile simplification.

* fc/makefile:
  Makefile: use $^ to avoid listing prerequisites on the command line
  build: do not install git-remote-testgit
  build: generate and clean test scripts

Many tests that check the behaviour of symbolic links stored in the
index or the tree objects do not have to be skipped on a filesystem
that lack symbolic link support.

* js/test-ln-s-add:
  t4011: remove SYMLINKS prerequisite
  t6035: use test_ln_s_add to remove SYMLINKS prerequisite
  t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite
  t3100: use test_ln_s_add to remove SYMLINKS prerequisite
  t3030: use test_ln_s_add to remove SYMLINKS prerequisite
  t0000: use test_ln_s_add to remove SYMLINKS prerequisite
  tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)
  tests: introduce test_ln_s_add
  t3010: modernize style
  test-chmtime: Fix exit code on Windows

* nd/make-wildmatch-default:
  Makefile: promote wildmatch to be the default fnmatch implementation

git-gui 0.18.0

* tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui:
  git-gui 0.18
  git-gui: avoid an error message when removing the last remote
  git-gui: fix file name handling with non-empty prefix
  git-gui: bring wish process to front on Mac
  git-gui: change dialog button positions for Windows to suit platform.
  git-gui: allow "\ No newline at end of file" for linewise staging
  git-gui: fix the mergetool launcher for the Beyond Compare tool.
  Makefile: replace "echo 1>..." with "echo >..."
  French translation: copy -> copie.
  git-gui: Fix parsing of <rev> <path-which-not-present-in-worktree>

Some people often run 'git status -b'.
The config variable status.branch allows to set it by default.
Signed-off-by: NJorge Juan Garcia Garcia <Jorge-Juan.Garcia-Garcia@ensimag.imag.fr>
Signed-off-by: NMathieu Lienard--Mayor <Mathieu.Lienard--Mayor@ensimag.imag.fr>
Reviewed-by: NMatthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Signed-off-by: NMatthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

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

Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

When the last remote is removed on a system that has tearoff menu items
the code that adjusts the fetch and prune menus may raise an error when
probing the menu entry for a non-existing -label option.
Check the entry type to avoid this fault.
Reported-by: NVedran Miletić <rivanvx@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Updates the code to make it more easy to switch mediawiki version when
testing. Before that, the version number was partly hardcoded, partly
in a var.
Signed-off-by: NBenoit Person <benoit.person@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

In subroutine parse_command, error messages were not correct. For the "import"
function, having too much or incorrect arguments displayed both
"invalid arguments", while it displayed "too many arguments" for the "option"
functions under the same conditions.
Separate the two error messages in both cases.
Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Option "-2" launches perlcritic with level 2. Levels go from 5 (most pertinent)
to 1. Rules of level 1 are mostly a question of style, and are therefore
ignored.
Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Such a file allows to configure perlcritic.
Here, it is used to remove many unwanted rules and configure one to
remove unwanted warnings.
Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

@$var structures are re-written in the following way: @{$var}
It makes them more readable.
Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Non-trivial numeric values (e.g., different from 0, 1 and 2) are placed in
constants at the top of the code to be easily modifiable and to make more sense
Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Empty strings are replaced by an $EMPTY constant.
Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

This follows the following rule:
InputOutput::RequireBracedFileHandleWithPrint (Severity: 1)
    The `print' and `printf' functions have a unique syntax that supports an
    optional file handle argument. Conway suggests wrapping this argument in
    braces to make it visually stand out from the other arguments. When you
    put braces around any of the special package-level file handles like
    `STDOUT', `STDERR', and `DATA', you must the `'*'' sigil or else it
    won't compile under `use strict 'subs''.

      print $FH   "Mary had a little lamb\n";  #not ok
      print {$FH} "Mary had a little lamb\n";  #ok

      print   STDERR   $foo, $bar, $baz;  #not ok
      print  {STDERR}  $foo, $bar, $baz;  #won't compile under 'strict'
      print {*STDERR}  $foo, $bar, $baz;  #perfect!
Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

- strings which don't need interpolation are single-quoted for more clarity and
slight gain of performance
- interpolation is preferred over concatenation in many cases, for more clarity
- variables are always used with the ${} operator inside strings
- strings including double-quotes are written with qq() so that the quotes do
not have to be escaped
Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Explicitly assign local variable $/ as undef and make a proper
one-instruction-by-line indentation
Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NCélestin Matte <celestin.matte@ensimag.fr>
Signed-off-by: NMatthieu Moy <matthieu.moy@grenoble-inp.fr>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>