Merge branch 'maint-1.7.8' into maint-1.7.9

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

diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt
index 605a085326022dec46cf15c0c4e4f435a1bd12bd..168e8bfed644c5f22bfb5e45801884128e306e4a 100644 (file)
--- a/Documentation/gitweb.txt
+++ b/Documentation/gitweb.txt
@@ -14,7 +14,7 @@ gitweb.
 
 DESCRIPTION
 -----------
-Gitweb provides a web interface to git repositories.  It's features include:
+Gitweb provides a web interface to git repositories.  Its features include:
 
 * Viewing multiple Git repositories with common root.
 * Browsing every revision of the repository.
@@ -60,7 +60,7 @@ to gitweb.  The list of projects is generated by default by scanning the
 more exact; gitweb is not interested in a working area, and is best suited
 to showing "bare" repositories).
 
-The name of repository in gitweb is path to it's `$GIT_DIR` (it's object
+The name of the repository in gitweb is the path to its `$GIT_DIR` (its object
 database) relative to `$projectroot`.  Therefore the repository $repo can be
 found at "$projectroot/$repo".
 

diff --git a/connected.c b/connected.c
index d7624230d435ded5ef7ba126ef77ab0e888af19b..1e89c1cd1d63f160bf7c95de41be61ff2d888e70 100644 (file)
--- a/connected.c
+++ b/connected.c
@@ -6,18 +6,18 @@
 /*
  * If we feed all the commits we want to verify to this command
  *
- *  $ git rev-list --verify-objects --stdin --not --all
+ *  $ git rev-list --objects --stdin --not --all
  *
  * and if it does not error out, that means everything reachable from
- * these commits locally exists and is connected to some of our
- * existing refs.
+ * these commits locally exists and is connected to our existing refs.
+ * Note that this does _not_ validate the individual objects.
  *
  * Returns 0 if everything is connected, non-zero otherwise.
  */
 int check_everything_connected(sha1_iterate_fn fn, int quiet, void *cb_data)
 {
        struct child_process rev_list;
-       const char *argv[] = {"rev-list", "--verify-objects",
+       const char *argv[] = {"rev-list", "--objects",
                              "--stdin", "--not", "--all", NULL, NULL};
        char commit[41];
        unsigned char sha1[20];