Merge branch 'sl/const'

Code cleanup.

* sl/const:
  various: tighten constness of some local variables

diff --cc builtin/diff.c
Simple merge

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