Merge branch 'jm/free'

* jm/free:
  Avoid unnecessary "if-before-free" tests.

Conflicts:

	builtin-branch.c

diff --cc builtin-branch.c
Simple merge

diff --cc builtin-fast-export.c
Simple merge

diff --cc builtin-pack-objects.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc pretty.c
Simple merge

diff --cc remote.c
Simple merge