git, branch v1.7.11.7

Git 1.7.11.7

2012-09-15T03:57:23Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11

2012-09-15T03:48:31Z

* jk/maint-quiet-is-synonym-to-s-in-log: log: fix --quiet synonym for -s

Merge branch 'jc/maint-ident-missing-human-name' into maint-1.7.11

2012-09-15T03:48:22Z

* jc/maint-ident-missing-human-name: split_ident_line(): make best effort when parsing author/committer line

Merge branch 'rj/test-regex' into maint-1.7.11

2012-09-15T03:46:39Z

* rj/test-regex: test-regex: Add a test to check for a bug in the regex routines

Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11

2012-09-15T03:45:55Z

* da/gitk-reload-tag-contents: gitk: Rename 'tagcontents' to 'cached_tagcontent' gitk: Teach "Reread references" to reload tags gitk: Avoid Meta1-F5

Merge branch 'jc/maint-checkout-fileglob-doc' into maint-1.7.11

2012-09-15T03:45:03Z

* jc/maint-checkout-fileglob-doc: gitcli: contrast wildcard given to shell and to git gitcli: formatting fix Document file-glob for "git checkout -- '*.c'"

Merge branch 'jc/apply-binary-p0' into maint-1.7.11

2012-09-12T21:00:53Z

"git apply -p0" did not parse pathnames on "diff --git" line correctly. This caused patches that had pathnames in no other places to be mistakenly rejected (most notably, binary patch that does not rename nor change mode). Textual patches, renames or mode changes have preimage and postimage pathnames in different places in a form that can be parsed unambiguously and did not suffer from this problem. * jc/apply-binary-p0: apply: compute patch->def_name correctly under -p0

Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11

2012-09-12T21:00:34Z

"git log .." errored out saying it is both rev range and a path when there is no disambiguating "--" is on the command line. Update the command line parser to interpret ".." as a path in such a case. * jc/dotdot-is-parent-directory: specifying ranges: we did not mean to make ".." an empty set

Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name' into maint-1.7.11

2012-09-12T20:59:58Z

The synopsis said "checkout [-B branch]" to make it clear the branch name is a parameter to the option, but the heading for the option description was "-B::", not "-B branch::", making the documentation misleading. * jc/maint-doc-checkout-b-always-takes-branch-name: doc: "git checkout -b/-B/--orphan" always takes a branch name

Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11

2012-09-12T20:58:23Z

Pushing to smart HTTP server with recent Git fails without having the username in the URL to force authentication, if the server is configured to allow GET anonymously, while requiring authentication for POST. * jk/maint-http-half-auth-push: http: prompt for credentials on failed POST http: factor out http error code handling t: test http access to "half-auth" repositories t: test basic smart-http authentication t/lib-httpd: recognize */smart/* repos as smart-http t/lib-httpd: only route auth/dumb to dumb repos t5550: factor out http auth setup t5550: put auth-required repo in auth/dumb