From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Nov 2008 03:24:36 +0000 (-0800)
Subject: Merge branch 'rs/strbuf-expand'
X-Git-Tag: v1.6.1-rc1~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2d2b3fd8485eee6dd238b930f2592535730089a4?ds=inline;hp=-c

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
---

2d2b3fd8485eee6dd238b930f2592535730089a4
diff --combined Makefile
index acac0ae5d9,54e0745246..649cfb819f
--- a/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