git/strbuf.c, branch v2.3.0

Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'

2015-01-07T20:49:19Z

The commented output used to blindly add a SP before the payload line, resulting in "# \t\n" when the payload began with a HT. Instead, produce "#\t\n". * jc/strbuf-add-lines-avoid-sp-ht-sequence: strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines

strbuf_add_commented_lines(): avoid SP-HT sequence in commented lines

2014-10-27T21:13:59Z

The strbuf_add_commented_lines() function passes a pair of prefixes, one to be used for a non-empty line, and the other for an empty line, to underlying add_lines(). The former is set to a comment char followed by a SP, while the latter is set to just the comment char. This is designed to give a SP after the comment character, e.g. "# \n", on a line with some text, and to avoid emitting an unsightly "# \n" for an empty line. Teach this machinery to also use the latter space-less prefix when the payload line begins with a tab, to show e.g. "#\t\n"; otherwise we will end up showing "# \t\n" which is similarly unsightly. Signed-off-by: Junio C Hamano

Merge branch 'rs/export-strbuf-addchars'

2014-09-19T18:38:39Z

Code clean-up. * rs/export-strbuf-addchars: strbuf: use strbuf_addchars() for adding a char multiple times strbuf: export strbuf_addchars()

strbuf: export strbuf_addchars()

2014-09-08T18:26:45Z

Move strbuf_addchars() to strbuf.c, where it belongs, and make it available for other callers. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'rs/strbuf-getcwd'

2014-09-02T20:28:44Z

Reduce the use of fixed sized buffer passed to getcwd() calls by introducing xgetcwd() helper. * rs/strbuf-getcwd: use strbuf_add_absolute_path() to add absolute paths abspath: convert absolute_path() to strbuf use xgetcwd() to set $GIT_DIR use xgetcwd() to get the current directory or die wrapper: add xgetcwd() abspath: convert real_path_internal() to strbuf abspath: use strbuf_getcwd() to remember original working directory setup: convert setup_git_directory_gently_1 et al. to strbuf unix-sockets: use strbuf_getcwd() strbuf: add strbuf_getcwd()

abspath: convert absolute_path() to strbuf

2014-08-26T18:06:06Z

Move most of the code of absolute_path() into the new function strbuf_add_absolute_path() and in the process transform it to use struct strbuf and xgetcwd() instead of a PATH_MAX-sized buffer, which can be too small on some file systems. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

strbuf: add strbuf_getcwd()

2014-07-28T20:48:07Z

Add strbuf_getcwd(), which puts the current working directory into a strbuf. Because it doesn't use a fixed-size buffer it supports arbitrarily long paths, provided the platform's getcwd() does as well. At least on Linux and FreeBSD it handles paths longer than PATH_MAX just fine. Suggested-by: Karsten Blees Helped-by: Duy Nguyen Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'jk/strip-suffix'

2014-07-16T18:26:00Z

* jk/strip-suffix: prepare_packed_git_one: refactor duplicate-pack check verify-pack: use strbuf_strip_suffix strbuf: implement strbuf_strip_suffix index-pack: use strip_suffix to avoid magic numbers use strip_suffix instead of ends_with in simple cases replace has_extension with ends_with implement ends_with via strip_suffix add strip_suffix function sha1_file: replace PATH_MAX buffer with strbuf in prepare_packed_git_one()

implement ends_with via strip_suffix

2014-06-30T20:43:16Z

The ends_with function is essentially a simplified version of strip_suffix, in which we throw away the stripped length. Implementing it as an inline on top of strip_suffix has two advantages: 1. We save a bit of duplicated code. 2. The suffix is typically a string literal, and we call strlen on it. By making the function inline, many compilers can replace the strlen call with a constant. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

strbuf: add xstrfmt helper

2014-06-19T19:25:17Z

You can use a strbuf to build up a string from parts, and then detach it. In the general case, you might use multiple strbuf_add* functions to do the building. However, in many cases, a single strbuf_addf is sufficient, and we end up with: struct strbuf buf = STRBUF_INIT; ... strbuf_addf(&buf, fmt, some, args); str = strbuf_detach(&buf, NULL); We can make this much more readable (and avoid introducing an extra variable, which can clutter the code) by introducing a convenience function: str = xstrfmt(fmt, some, args); Signed-off-by: Jeff King Signed-off-by: Junio C Hamano