| commit | 9db397978416f9d562a94e55db86c7a45210a05c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jul 2016 21:13:44 +0000 (25 14:13 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jul 2016 21:13:44 +0000 (25 14:13 -0700) | ||
| tree | 7229b749a1f9eefe19a522fe5a5b4d0f18bea8b2 | treesnapshot (tar.gz zip) |
| parent | 3cc75c10d781572a073d7dbff4e1695b93a89d48 | commitdiff |
| parent | 90cf590f53f2939a47ca7b397e270e8228699829 | commitdiff |
Merge branch 'js/fsck-name-object'
When "git fsck" reports a broken link (e.g. a tree object contains
a blob that does not exist), both containing object and the object
that is referred to were reported with their 40-hex object names.
The command learned the "--name-objects" option to show the path to
the containing object from existing refs (e.g. "HEAD~24^2:file.txt").
* js/fsck-name-object:
fsck: optionally show more helpful info for broken links
fsck: give the error function a chance to see the fsck_options
fsck_walk(): optionally name objects on the go
fsck: refactor how to describe objects
When "git fsck" reports a broken link (e.g. a tree object contains
a blob that does not exist), both containing object and the object
that is referred to were reported with their 40-hex object names.
The command learned the "--name-objects" option to show the path to
the containing object from existing refs (e.g. "HEAD~24^2:file.txt").
* js/fsck-name-object:
fsck: optionally show more helpful info for broken links
fsck: give the error function a chance to see the fsck_options
fsck_walk(): optionally name objects on the go
fsck: refactor how to describe objects