user/sven/git.git/strbuf.c, branch v1.7.3.5

Merge branch 'ap/merge-backend-opts'

2010-01-21T04:28:50Z

* ap/merge-backend-opts: Document that merge strategies can now take their own options Extend merge-subtree tests to test -Xsubtree=dir. Make "subtree" part more orthogonal to the rest of merge-recursive. pull: Fix parsing of -X

Merge branch 'jk/warn-author-committer-after-commit'

2010-01-20T22:40:12Z

* jk/warn-author-committer-after-commit: user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere commit.c::print_summary: do not release the format string too early commit: allow suppression of implicit identity advice commit: show interesting ident information in summary strbuf: add strbuf_addbuf_percentquote strbuf_expand: convert "%%" to "%" Conflicts: builtin-commit.c ident.c

git merge -X

2010-01-18T06:45:06Z

Teach "-X

strbuf: add strbuf_addbuf_percentquote

2010-01-14T17:25:15Z

This is handy for creating strings which will be fed to printf() or strbuf_expand(). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

strbuf_expand: convert "%%" to "%"

2010-01-14T17:24:42Z

The only way to safely quote arbitrary text in a pretty-print user format is to replace instances of "%" with "%x25". This is slightly unreadable, and many users would expect "%%" to produce a single "%", as that is what printf format specifiers do. This patch converts "%%" to "%" for all users of strbuf_expand(): (1) git-daemon interpolated paths (2) pretty-print user formats (3) merge driver command lines Case (1) was already doing the conversion itself outside of strbuf_expand(). Case (2) is the intended beneficiary of this patch. Case (3) users probably won't notice, but as this is user-facing behavior, consistently providing the quoting mechanism makes sense. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

strbuf.c: remove unused function

2010-01-12T09:06:09Z

strbuf_tolower() is not used anywhere. Signed-off-by: Junio C Hamano

strbuf: add new function strbuf_getwholeline()

2009-08-05T19:13:56Z

This function is just like strbuf_getline() except it retains the line-termination character. This function will be used by the mailinfo and mailsplit builtins which require the entire line for parsing. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

fread does not return negative on error

2009-06-23T23:57:15Z

size_t res cannot be less than 0. fread returns 0 on error. Reported-by: Ingo Molnar Signed-off-by: Roel Kluin Signed-off-by: Junio C Hamano

strbuf_check_branch_ref(): a helper to check a refname for a branch

2009-03-23T06:52:11Z

This allows a common calling sequence strbuf_branchname(&ref, name); strbuf_splice(&ref, 0, 0, "refs/heads/", 11); if (check_ref_format(ref.buf)) die(...); to be refactored into if (strbuf_check_branch_ref(&ref, name)) die(...); Signed-off-by: Junio C Hamano

strbuf_branchname(): a wrapper for branch name shorthands

2009-03-23T06:44:08Z

The function takes a user-supplied string that is supposed to be a branch name, and puts it in a strbuf after expanding possible shorthand notation. A handful of open coded sequence to do this in the existing code have been changed to use this helper function. Signed-off-by: Junio C Hamano