From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2012 22:53:31 +0000 (-0700)
Subject: Merge branch 'mh/string-list'
X-Git-Tag: v1.8.0-rc0~46
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3b0b6b53d5fa8f7ea5d2d9ddb74b0f8186252d28?ds=inline;hp=-c

Merge branch 'mh/string-list'

* mh/string-list:
api-string-list.txt: initialize the string_list the easy way
string_list: add a function string_list_longest_prefix()
string_list: add a new function, string_list_remove_duplicates()
string_list: add a new function, filter_string_list()
string_list: add two new functions for splitting strings
string_list: add function string_list_append_nodup()
---

3b0b6b53d5fa8f7ea5d2d9ddb74b0f8186252d28
diff --combined .gitignore
index 68fe464090,0ca7df8e02..a188a82bb1
--- a/.gitignore
+++ b/.gitignore
@@@ -189,11 -189,11 +189,12 @@@
  /test-mktemp
  /test-parse-options
  /test-path-utils
 +/test-regex
  /test-revision-walking
  /test-run-command
  /test-sha1
  /test-sigchain
+ /test-string-list
  /test-subprocess
  /test-svn-fe
  /common-cmds.h
diff --combined Makefile
index 56301dc0a8,ebbb381c19..a49d1db288
--- a/Makefile
+++ b/Makefile
@@@ -90,8 -90,6 +90,8 @@@ all:
  #
  # Define NO_MKDTEMP if you don't have mkdtemp in the C library.
  #
 +# Define MKDIR_WO_TRAILING_SLASH if your mkdir() can't deal with trailing slash.
 +#
  # Define NO_MKSTEMPS if you don't have mkstemps in the C library.
  #
  # Define NO_STRTOK_R if you don't have strtok_r in the C library.
@@@ -159,11 -157,6 +159,11 @@@
  # Define NO_PREAD if you have a problem with pread() system call (e.g.
  # cygwin1.dll before v1.5.22).
  #
 +# Define NO_SETITIMER if you don't have setitimer()
 +#
 +# Define NO_STRUCT_ITIMERVAL if you don't have struct itimerval
 +# This also implies NO_SETITIMER
 +#
  # Define NO_THREAD_SAFE_PREAD if your pread() implementation is not
  # thread-safe. (e.g. compat/pread.c or cygwin)
  #
@@@ -503,12 -496,12 +503,13 @@@ TEST_PROGRAMS_NEED_X += test-mergesor
  TEST_PROGRAMS_NEED_X += test-mktemp
  TEST_PROGRAMS_NEED_X += test-parse-options
  TEST_PROGRAMS_NEED_X += test-path-utils
 +TEST_PROGRAMS_NEED_X += test-regex
  TEST_PROGRAMS_NEED_X += test-revision-walking
  TEST_PROGRAMS_NEED_X += test-run-command
  TEST_PROGRAMS_NEED_X += test-scrap-cache-tree
  TEST_PROGRAMS_NEED_X += test-sha1
  TEST_PROGRAMS_NEED_X += test-sigchain
+ TEST_PROGRAMS_NEED_X += test-string-list
  TEST_PROGRAMS_NEED_X += test-subprocess
  TEST_PROGRAMS_NEED_X += test-svn-fe
  
@@@ -1647,10 -1640,6 +1648,10 @@@ ifdef NO_MKDTEM
  	COMPAT_CFLAGS += -DNO_MKDTEMP
  	COMPAT_OBJS += compat/mkdtemp.o
  endif
 +ifdef MKDIR_WO_TRAILING_SLASH
 +	COMPAT_CFLAGS += -DMKDIR_WO_TRAILING_SLASH
 +	COMPAT_OBJS += compat/mkdir.o
 +endif
  ifdef NO_MKSTEMPS
  	COMPAT_CFLAGS += -DNO_MKSTEMPS
  endif
@@@ -1682,13 -1671,6 +1683,13 @@@ endi
  ifdef OBJECT_CREATION_USES_RENAMES
  	COMPAT_CFLAGS += -DOBJECT_CREATION_MODE=1
  endif
 +ifdef NO_STRUCT_ITIMERVAL
 +	COMPAT_CFLAGS += -DNO_STRUCT_ITIMERVAL
 +	NO_SETITIMER=YesPlease
 +endif
 +ifdef NO_SETITIMER
 +	COMPAT_CFLAGS += -DNO_SETITIMER
 +endif
  ifdef NO_PREAD
  	COMPAT_CFLAGS += -DNO_PREAD
  	COMPAT_OBJS += compat/pread.o