diff options
author | Junio C Hamano <junkio@cox.net> | 2007-02-03 22:14:40 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-02-03 23:05:34 -0800 |
commit | d77ee72662a821d66ae218056f0103eb24d8d4b4 (patch) | |
tree | e22abdbd11735a0669362f934ae723d233c87e2b /server-info.c | |
parent | eb8381c88518b10d683a29deea1d43ed671f14ec (diff) | |
parent | 8d0fc48f27304ac1bc7abf802ec53fe66fedb15a (diff) | |
download | git-d77ee72662a821d66ae218056f0103eb24d8d4b4.tar.gz git-d77ee72662a821d66ae218056f0103eb24d8d4b4.tar.xz |
Merge branch 'master' into np/dreflog
This is to resolve conflicts early in preparation for possible
inclusion of "reflog on detached HEAD" series by Nico, as having
it in 1.5.0 would really help us remove confusion between
detached and attached states.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'server-info.c')
-rw-r--r-- | server-info.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/server-info.c b/server-info.c index 6cd38be32..f9be5a7f6 100644 --- a/server-info.c +++ b/server-info.c @@ -10,6 +10,8 @@ static FILE *info_ref_fp; static int add_info_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data) { struct object *o = parse_object(sha1); + if (!o) + return -1; fprintf(info_ref_fp, "%s %s\n", sha1_to_hex(sha1), path); if (o->type == OBJ_TAG) { |