Skip to content

Commit 6eab5f2

Browse files
committed
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
2 parents cb2ed32 + b1bcfbe commit 6eab5f2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Documentation/gitweb.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ gitweb.
1414

1515
DESCRIPTION
1616
-----------
17-
Gitweb provides a web interface to git repositories. It's features include:
17+
Gitweb provides a web interface to git repositories. Its features include:
1818

1919
* Viewing multiple Git repositories with common root.
2020
* Browsing every revision of the repository.
@@ -60,7 +60,7 @@ to gitweb. The list of projects is generated by default by scanning the
6060
more exact; gitweb is not interested in a working area, and is best suited
6161
to showing "bare" repositories).
6262

63-
The name of repository in gitweb is path to it's `$GIT_DIR` (it's object
63+
The name of the repository in gitweb is the path to its `$GIT_DIR` (its object
6464
database) relative to `$projectroot`. Therefore the repository $repo can be
6565
found at "$projectroot/$repo".
6666

connected.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
/*
77
* If we feed all the commits we want to verify to this command
88
*
9-
* $ git rev-list --verify-objects --stdin --not --all
9+
* $ git rev-list --objects --stdin --not --all
1010
*
1111
* and if it does not error out, that means everything reachable from
12-
* these commits locally exists and is connected to some of our
13-
* existing refs.
12+
* these commits locally exists and is connected to our existing refs.
13+
* Note that this does _not_ validate the individual objects.
1414
*
1515
* Returns 0 if everything is connected, non-zero otherwise.
1616
*/
1717
int check_everything_connected(sha1_iterate_fn fn, int quiet, void *cb_data)
1818
{
1919
struct child_process rev_list;
20-
const char *argv[] = {"rev-list", "--verify-objects",
20+
const char *argv[] = {"rev-list", "--objects",
2121
"--stdin", "--not", "--all", NULL, NULL};
2222
char commit[41];
2323
unsigned char sha1[20];

0 commit comments

Comments
 (0)