diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-10 12:44:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-10 12:44:45 -0700 |
| commit | 6eab5f2f14806cf6a7b665d96766a59c13a41f4b (patch) | |
| tree | d253b7e89110bf4bdb4efd1c6dc19eaecb5986ae /connected.c | |
| parent | Git 1.7.9.6 (diff) | |
| parent | Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8 (diff) | |
| download | tgif-6eab5f2f14806cf6a7b665d96766a59c13a41f4b.tar.xz | |
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
Diffstat (limited to 'connected.c')
| -rw-r--r-- | connected.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/connected.c b/connected.c index d7624230d4..1e89c1cd1d 100644 --- 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]; |