Skip to content

Commit

Permalink
Merge branch 'jc/fsck-default-full'
Browse files Browse the repository at this point in the history
* jc/fsck-default-full:
  fsck: default to "git fsck --full"
  • Loading branch information
Junio C Hamano committed Oct 26, 2009
2 parents 6665b9e + f29cd39 commit 0ee10fe
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
11 changes: 11 additions & 0 deletions Documentation/RelNotes-1.6.6.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
GIT v1.6.6 Release Notes
========================

In this release, "git fsck" defaults to "git fsck --full" and checks
packfiles, and because of this it will take much longer to complete
than before. If you prefer a quicker check only on loose objects (the
old default), you can say "git fsck --no-full". This has been
supported by 1.5.4 and newer versions of git, so it is safe to write
it in your script even if you use slightly older git on some of your
machines.

In git 1.7.0, which is planned to be the release after 1.6.6, "git
push" into a branch that is currently checked out will be refused by
default.
Expand Down Expand Up @@ -38,6 +46,9 @@ Updates since v1.6.5

(usability, bells and whistles)

* "git fsck" by default checks the packfiles (i.e. "--full" is the
default); you can turn it off with "git fsck --no-full".

* "git log --decorate" shows the location of HEAD as well.

(developers)
Expand Down
5 changes: 3 additions & 2 deletions Documentation/git-fsck.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
[--full] [--strict] [--verbose] [--lost-found] [<object>*]
[--[no-]full] [--strict] [--verbose] [--lost-found] [<object>*]

DESCRIPTION
-----------
Expand Down Expand Up @@ -52,7 +52,8 @@ index file, all SHA1 references in .git/refs/*, and all reflogs (unless
or $GIT_DIR/objects/info/alternates,
and in packed git archives found in $GIT_DIR/objects/pack
and corresponding pack subdirectories in alternate
object pools.
object pools. This is now default; you can turn it off
with --no-full.

--strict::
Enable more strict checking, namely to catch a file mode
Expand Down
2 changes: 1 addition & 1 deletion builtin-fsck.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ static int show_root;
static int show_tags;
static int show_unreachable;
static int include_reflogs = 1;
static int check_full;
static int check_full = 1;
static int check_strict;
static int keep_cache_objects;
static unsigned char head_sha1[20];
Expand Down

0 comments on commit 0ee10fe

Please sign in to comment.