diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-02-24 21:01:19 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-02-24 21:01:19 +0300 |
commit | dc31cd8fcc20d95a80da5ebe6feaab01539ebe4c (patch) | |
tree | 3ae76ea0df2e0028d7ee5ebc032d805597c22978 /refs.c | |
parent | e85486450eb0407ad0449d0214b97506d452407f (diff) | |
parent | 8c87dc77ae45d7277001b1be2c88ea9062e11d72 (diff) |
Merge branch 'maint'
* maint:
Protect peel_ref fallback case from NULL parse_object result
Ensure 'make dist' compiles git-archive.exe on Cygwin
Diffstat (limited to 'refs.c')
-rw-r--r-- | refs.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -506,7 +506,7 @@ int peel_ref(const char *ref, unsigned char *sha1) /* fallback - callers should not call this for unpacked refs */ o = parse_object(base); - if (o->type == OBJ_TAG) { + if (o && o->type == OBJ_TAG) { o = deref_tag(o, ref, 0); if (o) { hashcpy(sha1, o->sha1); |