diff options
author | Junio C Hamano <junkio@cox.net> | 2005-08-19 20:55:59 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-19 20:55:59 (GMT) |
commit | 0026d5484158ee093da5ab302ee794ec1931303f (patch) | |
tree | aa46e09a86e30381aee38863ffe9d76778261d93 | |
parent | 14022f5b1c5e5408ed5f1e8a91ae423e3228df0c (diff) | |
parent | 7f1335c74c4ba0baac8649974e95f6e6f84f8632 (diff) | |
download | git-0026d5484158ee093da5ab302ee794ec1931303f.zip git-0026d5484158ee093da5ab302ee794ec1931303f.tar.gz git-0026d5484158ee093da5ab302ee794ec1931303f.tar.bz2 |
Merge with master for a couple more fixes.
-rw-r--r-- | cache.h | 3 | ||||
-rwxr-xr-x | git-format-patch-script | 2 | ||||
-rw-r--r-- | rev-list.c | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -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 --- 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 @@ -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)); } /* |