git, branch v1.8.1-rc2

Git 1.8.1-rc2

2012-12-15T19:19:02Z

Signed-off-by: Junio C Hamano

Renumber list in api-command.txt

2012-12-15T18:46:47Z

Start list with 1 instead of 0; ASCIIDOC will renumber it anyway. Signed-off-by: Thomas Ackermann Signed-off-by: Junio C Hamano

remote-testsvn: fix unitialized variable

2012-12-15T18:43:11Z

In remote-test-svn, there is a parse_rev_note function to parse lines of the form "Revision-number" from notes. If it finds such a line and parses it, it returns 0, copying the value into a "struct rev_note". If it finds an entry that is garbled or out of range, it returns -1 to signal an error. However, if it does not find any "Revision-number" line at all, it returns success but does not put anything into the rev_note. So upon a successful return, the rev_note may or may not be initialized, and the caller has no way of knowing. gcc does not usually catch the use of the unitialized variable because the conditional assignment happens in a separate function from the point of use. However, when compiling with -O3, gcc will inline parse_rev_note and notice the problem. We can fix it by returning "-1" when no note is found (so on a zero return, we always found a valid value). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'maint'

2012-12-13T19:13:56Z

Fix sizeof usage in get_permutations

2012-12-13T19:13:44Z

Currently it gets the size of an otherwise unrelated, unused variable instead of the expected struct size. Signed-off-by: Matthew Daley Signed-off-by: Junio C Hamano

Merge branch 'mh/doc-remote-helpers'

2012-12-13T19:00:15Z

* mh/doc-remote-helpers: git-remote-helpers.txt: clarify options & ref list attributes git-remote-helpers.txt: clarify command <-> capability correspondences git-remote-helpers.txt: rearrange description of capabilities git-remote-helpers.txt: minor grammar fix git-remote-helpers.txt: document missing capabilities git-remote-helpers.txt: document invocation before input format

git.txt: add missing info about --git-dir command-line option

2012-12-13T18:54:01Z

Unlike other environment variables (e.g. GIT_WORK_TREE, GIT_NAMESPACE), the Documentation/git.txt file did not mention that the GIT_DIR environment variable can also be set using the --git-dir command line option. Signed-off-by: Manlio Perillo Signed-off-by: Junio C Hamano

git(1): show link to contributor summary page

2012-12-12T19:58:17Z

We earlier removed a link to list of contributors that pointed to a defunct page; let's use a working one from Ohloh.net to replace it instead. Signed-off-by: Junio C Hamano

Merge branch 'so/prompt-command'

2012-12-12T19:08:13Z

* so/prompt-command: git-prompt.sh: update PROMPT_COMMAND documentation

git-prompt.sh: update PROMPT_COMMAND documentation

2012-12-12T19:07:48Z

The description of __git_ps1 function operating in two-arg mode was not very clear. It said "set PROMPT_COMMAND=__git_ps1" which is not the right usage for this mode, followed by "To customize the prompt, do this", giving a false impression that those who do not want to customize it can get away with no-arg form, which was incorrect. Make it clear that this mode always takes two arguments, pre and post, with an example. The straight-forward one should be listed as the primary usage, and the confusing one should be an alternate for advanced users. Swap the order of these two. Acked-by: Simon Oosthoek Signed-off-by: Junio C Hamano