From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 24 Feb 2008 18:01:19 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~157
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dc31cd8fcc20d95a80da5ebe6feaab01539ebe4c?hp=e85486450eb0407ad0449d0214b97506d452407f

Merge branch 'maint'

* maint:
Protect peel_ref fallback case from NULL parse_object result
Ensure 'make dist' compiles git-archive.exe on Cygwin
---

diff --git a/Makefile b/Makefile
index d33a556ffe..a055f11aa6 100644
--- a/Makefile
+++ b/Makefile
@@ -1102,7 +1102,7 @@ git.spec: git.spec.in
 	mv $@+ $@
 
 GIT_TARNAME=git-$(GIT_VERSION)
-dist: git.spec git-archive configure
+dist: git.spec git-archive$(X) configure
 	./git-archive --format=tar \
 		--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
 	@mkdir -p $(GIT_TARNAME)
diff --git a/refs.c b/refs.c
index 67d2a502af..fb33da1112 100644
--- a/refs.c
+++ b/refs.c
@@ -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);