diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-09-20 22:02:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-20 22:02:01 -0700 |
| commit | 8da197755450d4f16018bd4b5486dc8ed88b0f2a (patch) | |
| tree | 9317d63e33d83995b6346eea465a4d290f991087 /fsck-objects.c | |
| parent | cb5d709ff8a4bae19d57a470ba2b137c25938a44 (diff) | |
| download | git-8da197755450d4f16018bd4b5486dc8ed88b0f2a.tar.gz git-8da197755450d4f16018bd4b5486dc8ed88b0f2a.tar.xz | |
Tell between packed, unpacked and symbolic refs.
This adds a "int *flag" parameter to resolve_ref() and makes
for_each_ref() family to call callback function with an extra
"int flag" parameter. They are used to give two bits of
information (REF_ISSYMREF and REF_ISPACKED) about the ref.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'fsck-objects.c')
| -rw-r--r-- | fsck-objects.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fsck-objects.c b/fsck-objects.c index bb0c94e9d..46b628cb9 100644 --- a/fsck-objects.c +++ b/fsck-objects.c @@ -402,7 +402,7 @@ static void fsck_dir(int i, char *path) static int default_refs; -static int fsck_handle_ref(const char *refname, const unsigned char *sha1, void *cb_data) +static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) { struct object *obj; @@ -458,9 +458,10 @@ static void fsck_object_dir(const char *path) static int fsck_head_link(void) { unsigned char sha1[20]; - const char *head_points_at = resolve_ref("HEAD", sha1, 1); + int flag; + const char *head_points_at = resolve_ref("HEAD", sha1, 1, &flag); - if (!head_points_at) + if (!head_points_at || !(flag & REF_ISSYMREF)) return error("HEAD is not a symbolic ref"); if (strncmp(head_points_at, "refs/heads/", 11)) return error("HEAD points to something strange (%s)", |