summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-24 18:01:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-24 18:01:19 (GMT)
commitdc31cd8fcc20d95a80da5ebe6feaab01539ebe4c (patch)
tree3ae76ea0df2e0028d7ee5ebc032d805597c22978
parente85486450eb0407ad0449d0214b97506d452407f (diff)
parent8c87dc77ae45d7277001b1be2c88ea9062e11d72 (diff)
downloadgit-dc31cd8fcc20d95a80da5ebe6feaab01539ebe4c.zip
git-dc31cd8fcc20d95a80da5ebe6feaab01539ebe4c.tar.gz
git-dc31cd8fcc20d95a80da5ebe6feaab01539ebe4c.tar.bz2
Merge branch 'maint'
* maint: Protect peel_ref fallback case from NULL parse_object result Ensure 'make dist' compiles git-archive.exe on Cygwin
-rw-r--r--Makefile2
-rw-r--r--refs.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d33a556..a055f11 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 67d2a50..fb33da1 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);