Revision 58d2c961b310d9366dd193f2d95d7eae56edecec authored by Jonathan Nieder on 09 October 2009, 10:18:58 UTC, committed by Junio C Hamano on 09 October 2009, 21:50:21 UTC
Update the documentation for --merged and --no-merged to explain the meaning of the optional parameter introduced in commit 049716b (branch --merged/--no-merged: allow specifying arbitrary commit, 2008-07-08). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 25dcc0d
fsck.h
#ifndef GIT_FSCK_H
#define GIT_FSCK_H
#define FSCK_ERROR 1
#define FSCK_WARN 2
/*
* callback function for fsck_walk
* type is the expected type of the object or OBJ_ANY
* the return value is:
* 0 everything OK
* <0 error signaled and abort
* >0 error signaled and do not abort
*/
typedef int (*fsck_walk_func)(struct object *obj, int type, void *data);
/* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
typedef int (*fsck_error)(struct object *obj, int type, const char *err, ...);
int fsck_error_function(struct object *obj, int type, const char *fmt, ...);
/* descend in all linked child objects
* the return value is:
* -1 error in processing the object
* <0 return value of the callback, which lead to an abort
* >0 return value of the first signaled error >0 (in the case of no other errors)
* 0 everything OK
*/
int fsck_walk(struct object *obj, fsck_walk_func walk, void *data);
int fsck_object(struct object *obj, int strict, fsck_error error_func);
#endif
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...