Merge branch 'rs/strbuf-expand'

* rs/strbuf-expand:
remove the unused files interpolate.c and interpolate.h
daemon: deglobalize variable 'directory'
daemon: inline fill_in_extra_table_entries()
daemon: use strbuf_expand() instead of interpolate()
merge-recursive: use strbuf_expand() instead of interpolate()
add strbuf_expand_dict_cb(), a helper for simple cases

diff --combined Makefile
index acac0ae5d91999e400c5efb6c529853ded83b78a,54e07452464c46854c0772221250c1cfe4d44a8b..649cfb819f6fc3f0164bac8d3c8b11aee6f0827f
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -437,7 -437,6 +437,6 @@@ LIB_OBJS += grep.
  LIB_OBJS += hash.o
  LIB_OBJS += help.o
  LIB_OBJS += ident.o
- LIB_OBJS += interpolate.o
  LIB_OBJS += levenshtein.o
  LIB_OBJS += list-objects.o
  LIB_OBJS += ll-merge.o
@@@ -496,7 -495,6 +495,7 @@@ LIB_OBJS += write_or_die.
  LIB_OBJS += ws.o
  LIB_OBJS += wt-status.o
  LIB_OBJS += xdiff-interface.o
 +LIB_OBJS += preload-index.o
  
  BUILTIN_OBJS += builtin-add.o
  BUILTIN_OBJS += builtin-annotate.o