diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-01 20:59:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-01 20:59:41 -0800 |
| commit | 7bb3beaf4fe81176aa2946e639ee75b1a9d4744c (patch) | |
| tree | f0fdff1204804a10730199a207fdda18124e90ef /builtin | |
| parent | 66b8800e53b20cda13446b462531641884089a77 (diff) | |
| parent | c6a13b2c86b71cb25011094ff2dee3d7769991a2 (diff) | |
| download | git-7bb3beaf4fe81176aa2946e639ee75b1a9d4744c.tar.gz | |
Merge branch 'cb/fsck-squelch-dangling'
* cb/fsck-squelch-dangling:
fsck: --no-dangling omits "dangling object" information
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fsck.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 8c479a791b..67eb553c7d 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -29,6 +29,7 @@ static int errors_found; static int write_lost_and_found; static int verbose; static int show_progress = -1; +static int show_dangling = 1; #define ERROR_OBJECT 01 #define ERROR_REACHABLE 02 #define ERROR_PACK 04 @@ -221,8 +222,9 @@ static void check_unreachable_object(struct object *obj) * start looking at, for example. */ if (!obj->used) { - printf("dangling %s %s\n", typename(obj->type), - sha1_to_hex(obj->sha1)); + if (show_dangling) + printf("dangling %s %s\n", typename(obj->type), + sha1_to_hex(obj->sha1)); if (write_lost_and_found) { char *filename = git_path("lost-found/%s/%s", obj->type == OBJ_COMMIT ? "commit" : "other", @@ -614,6 +616,7 @@ static char const * const fsck_usage[] = { static struct option fsck_opts[] = { OPT__VERBOSE(&verbose, "be verbose"), OPT_BOOLEAN(0, "unreachable", &show_unreachable, "show unreachable objects"), + OPT_BOOL(0, "dangling", &show_dangling, "show dangling objects"), OPT_BOOLEAN(0, "tags", &show_tags, "report tags"), OPT_BOOLEAN(0, "root", &show_root, "report root nodes"), OPT_BOOLEAN(0, "cache", &keep_cache_objects, "make index objects head nodes"), |