git, branch v1.7.11.4

Git 1.7.11.4

2012-07-30T20:16:51Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/maint-commit-document-editmsg' into maint

2012-07-30T20:05:36Z

"$GIT_DIR/COMMIT_EDITMSG" file that is used to hold the commit log message user edits was not documented. * jk/maint-commit-document-editmsg: commit: document the temporary commit message file

Merge branch 'jk/maint-advise-vaddf' into maint

2012-07-30T20:05:25Z

The advise() function did not use varargs correctly to format its message. * jk/maint-advise-vaddf: advice: pass varargs to strbuf_vaddf, not strbuf_addf

Merge branch 'kk/maint-commit-tree' into maint

2012-07-30T20:05:13Z

"git commit-tree" learned a more natural "-p " order of arguments long time ago, but recently forgot it by mistake. * kk/maint-commit-tree: Revert "git-commit-tree(1): update synopsis" commit-tree: resurrect command line parsing updates

Merge branch 'jv/maint-no-ext-diff' into maint

2012-07-30T20:04:59Z

"git diff --no-ext-diff" did not output anything for a typechange filepair when GIT_EXTERNAL_DIFF is in effect. * jv/maint-no-ext-diff: diff: test precedence of external diff drivers diff: correctly disable external_diff with --no-ext-diff

Merge branch 'pg/maint-1.7.9-am-where-is-patch' into maint

2012-07-30T20:04:39Z

When "git am" failed, old timers knew to check .git/rebase-apply/patch to see what went wrong, but we never told the users about it. * pg/maint-1.7.9-am-where-is-patch: am: indicate where a failed patch is to be found

Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink' into maint

2012-07-30T20:04:18Z

When "git submodule add" clones a submodule repository, it can get confused where to store the resulting submodule repository in the superproject's .git/ directory when there is a symbolic link in the path to the current directory. * jl/maint-1.7.10-recurse-submodules-with-symlink: submodules: don't stumble over symbolic links when cloning recursively

Merge branch 'jc/maint-filter-branch-epoch-date' into maint

2012-07-30T20:04:18Z

In 1.7.9 era, we taught "git rebase" about the raw timestamp format but we did not teach the same trick to "filter-branch", which rolled a similar logic on its own. * jc/maint-filter-branch-epoch-date: t7003: add test to filter a branch with a commit at epoch date.c: Fix off by one error in object-header date parsing filter-branch: do not forget the '@' prefix to force git-timestamp

commit: document the temporary commit message file

2012-07-23T22:10:36Z

We do not document COMMIT_EDITMSG at all, but users may want to know about it for two reasons: 1. They may want to tell their editor to configure itself for formatting a commit message. 2. If a commit is aborted by an error, the user may want to recover the commit message they typed. Let's put a note in git-commit(1). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

advice: pass varargs to strbuf_vaddf, not strbuf_addf

2012-07-23T20:10:43Z

The advise() function takes a variable number of arguments and converts them into a va_list object to pass to strbuf for handling. However, we accidentally called strbuf_addf (that takes a variable number of arguments) instead of strbuf_vaddf (that takes a va_list). This bug dates back to v1.7.8.1-1-g23cb5bf, but we never noticed because none of the current callers passes a string with a format specifier in it. And the compiler did not notice because the format string is not available at compile time. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano