Merge branch 'ak/git-strip-extension-from-dashed-command' into maint

Code simplification.

* ak/git-strip-extension-from-dashed-command:
  git.c: simplify stripping extension of a file in handle_builtin()

diff --cc git-compat-util.h
Simple merge

diff --cc git.c
Simple merge