Merge with master for a couple more fixes.

diff --git a/cache.h b/cache.h
index 9964667..ba5c4ab 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -38,11 +38,10 @@
 #define NORETURN __attribute__((__noreturn__))
 #else
 #define NORETURN
-#endif
-
 #ifndef __attribute__
 #define __attribute__(x)
 #endif
+#endif
 
 /*
  * Intensive research over the course of many years has shown that

diff --git a/git-format-patch-script b/git-format-patch-script
index 3565205..9b13b88 100755 (executable)
--- a/git-format-patch-script
+++ b/git-format-patch-script
@@ -195,7 +195,7 @@ Date: '"$ad"
                        echo
                }
        }
-
+       echo
        echo '---'
        echo
        git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary

diff --git a/rev-list.c b/rev-list.c
index ce5b8b2..2ed5e87 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -418,6 +418,8 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
                if (tag_objects && !(object->flags & UNINTERESTING))
                        add_pending_object(object, tag->tag);
                object = parse_object(tag->tagged->sha1);
+               if (!object)
+                       die("bad object %s", sha1_to_hex(tag->tagged->sha1));
        }
 
        /*