git, branch v1.7.9.7

Git 1.7.9.7

2012-04-26T17:23:15Z

Signed-off-by: Junio C Hamano

Sync with 1.7.8.6

2012-04-26T17:22:20Z

Git 1.7.8.6

2012-04-26T17:14:45Z

Signed-off-by: Junio C Hamano

Sync with 1.7.7.7

2012-04-26T16:52:33Z

Git 1.7.7.7

2012-04-26T16:41:52Z

Signed-off-by: Junio C Hamano

bundle: remove stray single-quote from error message

2012-04-26T15:08:07Z

After running rev-list --boundary to retrieve the list of boundary commits, "git bundle create" runs its own revision walk. If in this stage git encounters an unfamiliar option, it writes a message with an unbalanced quotation mark: error: unrecognized argument: --foo' Drop the stray quote to match the "unrecognized argument: %s" message used elsewhere and save translators some work. This is mostly a futureproofing measure: for now, the "rev-list --boundary" command catches most strange arguments on its own and the above message is not seen unless you try something esoteric like "git bundle create test.bundle --header HEAD". Reported-by: Junio C Hamano Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'maint-1.7.8' into maint-1.7.9

2012-04-10T19:44:45Z

* maint-1.7.8: Documentation/gitweb: trivial English fixes fetch/receive: remove over-pessimistic connectivity check

Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8

2012-04-09T20:43:16Z

* jc/maint-verify-objects-remove-pessimism: fetch/receive: remove over-pessimistic connectivity check

Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8

2012-04-09T20:42:56Z

* dw/gitweb-doc-grammo: Documentation/gitweb: trivial English fixes

Merge branch 'tr/cache-tree' into maint-1.7.8

2012-04-09T20:40:32Z

* tr/cache-tree: t0090: be prepared that 'wc -l' writes leading blanks reset: update cache-tree data when appropriate commit: write cache-tree data when writing index anyway Refactor cache_tree_update idiom from commit Test the current state of the cache-tree optimization Add test-scrap-cache-tree