@matheusbsbs / matheus-bagliano / commits / df391b192d
Fork 0

git-fsck-objects is now synonym to git-fsck

Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jan 28, 2007 at 16:33 UTC df391b192d285646fe80ca4d3cfe3c0a3beb5989
15 files changed +159 -140
.gitignore
+1
@@ -42,6 +42,7 @@ git-findtags
42 git-fmt-merge-msg
43 git-for-each-ref
44 git-format-patch
45 +git-fsck
46 git-fsck-objects
47 git-gc
48 git-get-tar-commit-id
Documentation/cmd-list.perl
+1 -1
@@ -97,7 +97,7 @@ git-fetch-pack synchingrepositories
97 git-fmt-merge-msg purehelpers
98 git-for-each-ref plumbinginterrogators
99 git-format-patch mainporcelain
100 -git-fsck-objects ancillaryinterrogators
100 +git-fsck ancillaryinterrogators
101 git-gc mainporcelain
102 git-get-tar-commit-id ancillaryinterrogators
103 git-grep mainporcelain
Documentation/core-intro.txt
+1 -1
@@ -82,7 +82,7 @@ size> + <byte\0> + <binary object data>.
82
83 The structured objects can further have their structure and
84 connectivity to other objects verified. This is generally done with
85 -the `git-fsck-objects` program, which generates a full dependency graph
85 +the `git-fsck` program, which generates a full dependency graph
86 of all objects, and verifies their internal consistency (in addition
87 to just verifying their superficial consistency through the hash).
88
Documentation/everyday.txt
+2 -2
@@ -28,7 +28,7 @@ Everybody uses these commands to maintain git repositories.
28 * gitlink:git-init[1] or gitlink:git-clone[1] to create a
29 new repository.
30
31 - * gitlink:git-fsck-objects[1] to check the repository for errors.
31 + * gitlink:git-fsck[1] to check the repository for errors.
32
33 * gitlink:git-prune[1] to remove unused objects in the repository.
34
@@ -43,7 +43,7 @@ Examples
43 Check health and remove cruft.::
44 +
45 ------------
46 -$ git fsck-objects <1>
46 +$ git fsck <1>
47 $ git count-objects <2>
48 $ git repack <3>
49 $ git gc <4>
Documentation/git-fsck-objects.txt
+3 -125
@@ -8,132 +8,10 @@ git-fsck-objects - Verifies the connectivity and validity of the objects in the
8
9 SYNOPSIS
10 --------
11 -[verse]
12 -'git-fsck-objects' [--tags] [--root] [--unreachable] [--cache]
13 - [--full] [--strict] [<object>*]
11 +'git-fsck-objects' ...
12
13 DESCRIPTION
14 -----------
17 -Verifies the connectivity and validity of the objects in the database.
18 -
19 -OPTIONS
20 --------
21 -<object>::
22 - An object to treat as the head of an unreachability trace.
23 -+
24 -If no objects are given, git-fsck-objects defaults to using the
25 -index file and all SHA1 references in .git/refs/* as heads.
26 -
27 ---unreachable::
28 - Print out objects that exist but that aren't readable from any
29 - of the reference nodes.
30 -
31 ---root::
32 - Report root nodes.
33 -
34 ---tags::
35 - Report tags.
36 -
37 ---cache::
38 - Consider any object recorded in the index also as a head node for
39 - an unreachability trace.
40 -
41 ---full::
42 - Check not just objects in GIT_OBJECT_DIRECTORY
43 - ($GIT_DIR/objects), but also the ones found in alternate
44 - object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES
45 - or $GIT_DIR/objects/info/alternates,
46 - and in packed git archives found in $GIT_DIR/objects/pack
47 - and corresponding pack subdirectories in alternate
48 - object pools.
49 -
50 ---strict::
51 - Enable more strict checking, namely to catch a file mode
52 - recorded with g+w bit set, which was created by older
53 - versions of git. Existing repositories, including the
54 - Linux kernel, git itself, and sparse repository have old
55 - objects that triggers this check, but it is recommended
56 - to check new projects with this flag.
57 -
58 -It tests SHA1 and general object sanity, and it does full tracking of
59 -the resulting reachability and everything else. It prints out any
60 -corruption it finds (missing or bad objects), and if you use the
61 -'--unreachable' flag it will also print out objects that exist but
62 -that aren't readable from any of the specified head nodes.
63 -
64 -So for example
65 -
66 - git-fsck-objects --unreachable HEAD $(cat .git/refs/heads/*)
67 -
68 -will do quite a _lot_ of verification on the tree. There are a few
69 -extra validity tests to be added (make sure that tree objects are
70 -sorted properly etc), but on the whole if "git-fsck-objects" is happy, you
71 -do have a valid tree.
72 -
73 -Any corrupt objects you will have to find in backups or other archives
74 -(i.e., you can just remove them and do an "rsync" with some other site in
75 -the hopes that somebody else has the object you have corrupted).
76 -
77 -Of course, "valid tree" doesn't mean that it wasn't generated by some
78 -evil person, and the end result might be crap. git is a revision
79 -tracking system, not a quality assurance system ;)
80 -
81 -Extracted Diagnostics
82 ----------------------
83 -
84 -expect dangling commits - potential heads - due to lack of head information::
85 - You haven't specified any nodes as heads so it won't be
86 - possible to differentiate between un-parented commits and
87 - root nodes.
88 -
89 -missing sha1 directory '<dir>'::
90 - The directory holding the sha1 objects is missing.
91 -
92 -unreachable <type> <object>::
93 - The <type> object <object>, isn't actually referred to directly
94 - or indirectly in any of the trees or commits seen. This can
95 - mean that there's another root node that you're not specifying
96 - or that the tree is corrupt. If you haven't missed a root node
97 - then you might as well delete unreachable nodes since they
98 - can't be used.
99 -
100 -missing <type> <object>::
101 - The <type> object <object>, is referred to but isn't present in
102 - the database.
103 -
104 -dangling <type> <object>::
105 - The <type> object <object>, is present in the database but never
106 - 'directly' used. A dangling commit could be a root node.
107 -
108 -warning: git-fsck-objects: tree <tree> has full pathnames in it::
109 - And it shouldn't...
110 -
111 -sha1 mismatch <object>::
112 - The database has an object who's sha1 doesn't match the
113 - database value.
114 - This indicates a serious data integrity problem.
115 -
116 -Environment Variables
117 ----------------------
118 -
119 -GIT_OBJECT_DIRECTORY::
120 - used to specify the object database root (usually $GIT_DIR/objects)
121 -
122 -GIT_INDEX_FILE::
123 - used to specify the index file of the index
124 -
125 -GIT_ALTERNATE_OBJECT_DIRECTORIES::
126 - used to specify additional object database roots (usually unset)
127 -
128 -Author
129 -------
130 -Written by Linus Torvalds <torvalds@osdl.org>
131 -
132 -Documentation
133 ---------------
134 -Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
135 -
136 -GIT
137 ----
138 -Part of the gitlink:git[7] suite
15
16 +This is a synonym for gitlink:git-fsck[1]. Please refer to the
17 +documentation of that command.
Documentation/git-fsck.txt new
+139
@@ -0,0 +1,139 @@
1 +git-fsck(1)
2 +===========
3 +
4 +NAME
5 +----
6 +git-fsck - Verifies the connectivity and validity of the objects in the database
7 +
8 +
9 +SYNOPSIS
10 +--------
11 +[verse]
12 +'git-fsck' [--tags] [--root] [--unreachable] [--cache]
13 + [--full] [--strict] [<object>*]
14 +
15 +DESCRIPTION
16 +-----------
17 +Verifies the connectivity and validity of the objects in the database.
18 +
19 +OPTIONS
20 +-------
21 +<object>::
22 + An object to treat as the head of an unreachability trace.
23 ++
24 +If no objects are given, git-fsck defaults to using the
25 +index file and all SHA1 references in .git/refs/* as heads.
26 +
27 +--unreachable::
28 + Print out objects that exist but that aren't readable from any
29 + of the reference nodes.
30 +
31 +--root::
32 + Report root nodes.
33 +
34 +--tags::
35 + Report tags.
36 +
37 +--cache::
38 + Consider any object recorded in the index also as a head node for
39 + an unreachability trace.
40 +
41 +--full::
42 + Check not just objects in GIT_OBJECT_DIRECTORY
43 + ($GIT_DIR/objects), but also the ones found in alternate
44 + object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES
45 + or $GIT_DIR/objects/info/alternates,
46 + and in packed git archives found in $GIT_DIR/objects/pack
47 + and corresponding pack subdirectories in alternate
48 + object pools.
49 +
50 +--strict::
51 + Enable more strict checking, namely to catch a file mode
52 + recorded with g+w bit set, which was created by older
53 + versions of git. Existing repositories, including the
54 + Linux kernel, git itself, and sparse repository have old
55 + objects that triggers this check, but it is recommended
56 + to check new projects with this flag.
57 +
58 +It tests SHA1 and general object sanity, and it does full tracking of
59 +the resulting reachability and everything else. It prints out any
60 +corruption it finds (missing or bad objects), and if you use the
61 +'--unreachable' flag it will also print out objects that exist but
62 +that aren't readable from any of the specified head nodes.
63 +
64 +So for example
65 +
66 + git-fsck --unreachable HEAD $(cat .git/refs/heads/*)
67 +
68 +will do quite a _lot_ of verification on the tree. There are a few
69 +extra validity tests to be added (make sure that tree objects are
70 +sorted properly etc), but on the whole if "git-fsck" is happy, you
71 +do have a valid tree.
72 +
73 +Any corrupt objects you will have to find in backups or other archives
74 +(i.e., you can just remove them and do an "rsync" with some other site in
75 +the hopes that somebody else has the object you have corrupted).
76 +
77 +Of course, "valid tree" doesn't mean that it wasn't generated by some
78 +evil person, and the end result might be crap. git is a revision
79 +tracking system, not a quality assurance system ;)
80 +
81 +Extracted Diagnostics
82 +---------------------
83 +
84 +expect dangling commits - potential heads - due to lack of head information::
85 + You haven't specified any nodes as heads so it won't be
86 + possible to differentiate between un-parented commits and
87 + root nodes.
88 +
89 +missing sha1 directory '<dir>'::
90 + The directory holding the sha1 objects is missing.
91 +
92 +unreachable <type> <object>::
93 + The <type> object <object>, isn't actually referred to directly
94 + or indirectly in any of the trees or commits seen. This can
95 + mean that there's another root node that you're not specifying
96 + or that the tree is corrupt. If you haven't missed a root node
97 + then you might as well delete unreachable nodes since they
98 + can't be used.
99 +
100 +missing <type> <object>::
101 + The <type> object <object>, is referred to but isn't present in
102 + the database.
103 +
104 +dangling <type> <object>::
105 + The <type> object <object>, is present in the database but never
106 + 'directly' used. A dangling commit could be a root node.
107 +
108 +warning: git-fsck: tree <tree> has full pathnames in it::
109 + And it shouldn't...
110 +
111 +sha1 mismatch <object>::
112 + The database has an object who's sha1 doesn't match the
113 + database value.
114 + This indicates a serious data integrity problem.
115 +
116 +Environment Variables
117 +---------------------
118 +
119 +GIT_OBJECT_DIRECTORY::
120 + used to specify the object database root (usually $GIT_DIR/objects)
121 +
122 +GIT_INDEX_FILE::
123 + used to specify the index file of the index
124 +
125 +GIT_ALTERNATE_OBJECT_DIRECTORIES::
126 + used to specify additional object database roots (usually unset)
127 +
128 +Author
129 +------
130 +Written by Linus Torvalds <torvalds@osdl.org>
131 +
132 +Documentation
133 +--------------
134 +Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
135 +
136 +GIT
137 +---
138 +Part of the gitlink:git[7] suite
139 +
Documentation/git-pack-redundant.txt
+1 -1
@@ -21,7 +21,7 @@ given will be ignored when checking which packs are required. This makes the
21 following command useful when wanting to remove packs which contain unreachable
22 objects.
23
24 -git-fsck-objects --full --unreachable | cut -d ' ' -f3 | \
24 +git-fsck --full --unreachable | cut -d ' ' -f3 | \
25 git-pack-redundant --all | xargs rm
26
27 OPTIONS
Documentation/git-prune.txt
+1 -1
@@ -13,7 +13,7 @@ SYNOPSIS
13 DESCRIPTION
14 -----------
15
16 -This runs `git-fsck-objects --unreachable` using all the refs
16 +This runs `git-fsck --unreachable` using all the refs
17 available in `$GIT_DIR/refs`, optionally with additional set of
18 objects specified on the command line, and prunes all
19 objects unreachable from any of these head objects from the object database.
Makefile
+2 -1
@@ -192,7 +192,7 @@ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
192
193 # ... and all the rest that could be moved out of bindir to gitexecdir
194 PROGRAMS = \
195 - git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
195 + git-convert-objects$X git-fetch-pack$X git-fsck$X \
196 git-hash-object$X git-index-pack$X git-local-fetch$X \
197 git-merge-base$X \
198 git-daemon$X \
@@ -214,6 +214,7 @@ EXTRA_PROGRAMS =
214 BUILT_INS = \
215 git-format-patch$X git-show$X git-whatchanged$X git-cherry$X \
216 git-get-tar-commit-id$X git-init$X git-repo-config$X \
217 + git-fsck-objects$X \
218 $(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
219
220 # what 'all' will build and 'install' will install, in gitexecdir
fsck.c renamed
+1 -1
@@ -606,7 +606,7 @@ int main(int argc, char **argv)
606 continue;
607 }
608 if (*arg == '-')
609 - usage("git-fsck-objects [--tags] [--root] [[--unreachable] [--cache] [--full] [--strict] <head-sha1>*]");
609 + usage("git-fsck [--tags] [--root] [[--unreachable] [--cache] [--full] [--strict] <head-sha1>*]");
610 }
611
612 fsck_head_link();
git-lost-found.sh
+1 -1
@@ -12,7 +12,7 @@ fi
12 laf="$GIT_DIR/lost-found"
13 rm -fr "$laf" && mkdir -p "$laf/commit" "$laf/other" || exit
14
15 -git fsck-objects --full |
15 +git fsck --full |
16 while read dangling type sha1
17 do
18 case "$dangling" in
http-fetch.c
+1 -1
@@ -1069,7 +1069,7 @@ int main(int argc, const char **argv)
1069 fprintf(stderr,
1070 "Some loose object were found to be corrupt, but they might be just\n"
1071 "a false '404 Not Found' error message sent with incorrect HTTP\n"
1072 -"status code. Suggest running git fsck-objects.\n");
1072 +"status code. Suggest running git-fsck.\n");
1073 }
1074 return rc;
1075 }
t/t1410-reflog.sh
+1 -1
@@ -20,7 +20,7 @@ check_have () {
20 }
21
22 check_fsck () {
23 - output=$(git fsck-objects --full)
23 + output=$(git fsck --full)
24 case "$1" in
25 '')
26 test -z "$output" ;;
t/t5500-fetch-pack.sh
+3 -3
@@ -63,13 +63,13 @@ pull_to_client () {
63 case "$heads" in *B*) echo $BTIP > .git/refs/heads/B;; esac
64 git-symbolic-ref HEAD refs/heads/`echo $heads | sed -e 's/^\(.\).*$/\1/'`
65
66 - test_expect_success "fsck" 'git-fsck-objects --full > fsck.txt 2>&1'
66 + test_expect_success "fsck" 'git-fsck --full > fsck.txt 2>&1'
67
68 test_expect_success 'check downloaded results' \
69 'mv .git/objects/pack/pack-* . &&
70 p=`ls -1 pack-*.pack` &&
71 git-unpack-objects <$p &&
72 - git-fsck-objects --full'
72 + git-fsck --full'
73
74 test_expect_success "new object count after $number pull" \
75 'idx=`echo pack-*.idx` &&
@@ -145,7 +145,7 @@ test_expect_success "clone shallow object count (part 2)" '
145 '
146
147 test_expect_success "fsck in shallow repo" \
148 - "(cd shallow; git-fsck-objects --full)"
148 + "(cd shallow; git-fsck --full)"
149
150 #test_done; exit
151
t/t5710-info-alternate.sh
+1 -1
@@ -17,7 +17,7 @@ reachable_via() {
17 }
18
19 test_valid_repo() {
20 - git fsck-objects --full > fsck.log &&
20 + git fsck --full > fsck.log &&
21 test `wc -l < fsck.log` = 0
22 }
23