diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-02 15:11:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-02 15:11:07 -0800 |
| commit | eadbcd498a18d60467883aeb6c0726048e7382a2 (patch) | |
| tree | 50e765722a06a56121c6431d47cd319a2594ae71 /upload-pack.c | |
| parent | c42f63671c0f09cba0c8247c4d1d8121f37798fe (diff) | |
| parent | 28f72a0f232dfc71b3be726e7e71d0a6d5f9ebba (diff) | |
| download | git-eadbcd498a18d60467883aeb6c0726048e7382a2.tar.gz | |
Merge branch 'mk/maint-parse-careful'
* mk/maint-parse-careful:
receive-pack: use strict mode for unpacking objects
index-pack: introduce checking mode
unpack-objects: prevent writing of inconsistent objects
unpack-object: cache for non written objects
add common fsck error printing function
builtin-fsck: move common object checking code to fsck.c
builtin-fsck: reports missing parent commits
Remove unused object-ref code
builtin-fsck: move away from object-refs to fsck_walk
add generic, type aware object chain walker
Conflicts:
Makefile
builtin-fsck.c
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c index b26d05331d..e5421db9c5 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -393,7 +393,6 @@ static int get_common_commits(void) char hex[41], last_hex[41]; int len; - track_object_refs = 0; save_commit_buffer = 0; for(;;) { |